jiangs/transitPlatForm
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

代码整理

Browse Source
This commit is contained in:
jiangs 2026-03-09 16:06:49 +08:00
parent 0e05948af6
commit 4b9bb812f9
52 changed files with 219 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
.idea/uiDesigner.xml generated Normal file
View File

@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegDiagnosis.java → pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegDiagnosis.java
View File

@ -1,4 +1,4 @@
package com.transitPlatForm.transitPF.pojo;
package com.transitPlatForm.common.core.domain.entity.reg;
import com.transitPlatForm.common.annotation.Excel;
import com.transitPlatForm.common.core.domain.BaseEntity;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegDict.java → pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegDict.java
View File

@ -1,4 +1,4 @@
package com.transitPlatForm.transitPF.pojo;
package com.transitPlatForm.common.core.domain.entity.reg;
import com.transitPlatForm.common.annotation.Excel;
import com.transitPlatForm.common.core.domain.BaseEntity;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegHospital.java → pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegHospital.java
View File

@ -1,4 +1,4 @@
package com.transitPlatForm.transitPF.pojo;
package com.transitPlatForm.common.core.domain.entity.reg;
import com.transitPlatForm.common.annotation.Excel;
import com.transitPlatForm.common.core.domain.BaseEntity;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegItemclass.java → pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegItemclass.java
View File

@ -1,4 +1,4 @@
package com.transitPlatForm.transitPF.pojo;
package com.transitPlatForm.common.core.domain.entity.reg;
import com.transitPlatForm.common.annotation.Excel;
import com.transitPlatForm.common.core.domain.BaseEntity;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegTransitSample.java → pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSample.java
View File

@ -1,4 +1,4 @@
package com.transitPlatForm.transitPF.pojo;
package com.transitPlatForm.common.core.domain.entity.reg;
import io.swagger.annotations.ApiModel;
import lombok.AllArgsConstructor;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegTransitSampleDetail.java → pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSampleDetail.java
View File

@ -1,4 +1,4 @@
package com.transitPlatForm.transitPF.pojo;
package com.transitPlatForm.common.core.domain.entity.reg;
import lombok.AllArgsConstructor;
import lombok.Data;

4
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegHospitalMapper.java → pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegHospitalMapper.java
View File

@ -1,6 +1,6 @@
package com.transitPlatForm.transitPF.mapper;
package com.transitPlatForm.interfaceCommon.mapper;
import com.transitPlatForm.transitPF.pojo.RegHospital;
import com.transitPlatForm.common.core.domain.entity.reg.RegHospital;
import java.util.List;

16
pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/utils/CommonUtil.java
View File

@ -2,6 +2,7 @@ package com.transitPlatForm.interfaceCommon.utils;
import com.transitPlatForm.common.core.domain.entity.SysUser;
import com.transitPlatForm.interfaceCommon.mapper.ComLocalconfigMapper;
import com.transitPlatForm.interfaceCommon.mapper.CommonMapper;
import com.transitPlatForm.interfaceCommon.mapper.SysUserCommMapper;
import org.apache.commons.lang3.time.DateFormatUtils;
@ -16,10 +17,12 @@ import java.util.stream.Collectors;
@Component
public class CommonUtil {
@Autowired
CommonMapper commonMapper;
@Autowired
CommonMapper commonMapper;
@Autowired
SysUserCommMapper sysUserCommMapper;
@Autowired
ComLocalconfigMapper comLocalconfigMapper;
//服务器时间方法
@ -43,10 +46,17 @@ public class CommonUtil {
return DateFormatUtils.format(rq, "yyyy-MM-dd HH:mm:ss");
}
public SysUser getSysUserOne(String user_name){
public SysUser getSysUserOne(String user_name) {
return sysUserCommMapper.getSysUserOne(user_name);
}
public String getLocalconfig(String smac) {
return comLocalconfigMapper.getLocalconfig(smac);
}
public String getLocalconfigByIP(String ip) {
return comLocalconfigMapper.getLocalconfigByIP(ip);
}
}

2
pf_transitPF/src/main/resources/mapper/RegHospitalMapper.xml → pf_interfaceCommon/src/main/resources/mapper/RegHospitalMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.transitPlatForm.transitPF.mapper.RegHospitalMapper">
<mapper namespace="com.transitPlatForm.interfaceCommon.mapper.RegHospitalMapper">
<resultMap type="RegHospital" id="RegHospitalResult">
<id property="hospitalId" column="hospital_id" />
<result property="hospitalCode" column="hospital_code" />

6
pf_system/pom.xml
View File

@ -25,7 +25,11 @@
<dependency>
<groupId>com.transitPlatForm</groupId>
<artifactId>pf_interfaceCommon</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.transitPlatForm</groupId>
<artifactId>pf_transitPF</artifactId>
</dependency>
<!--定时任务-->

16
pf_system/src/main/java/com/transitPlatForm/system/web/controller/system/SysLoginController.java
View File

@ -119,12 +119,12 @@ public class SysLoginController {
* @param localid 浏览器指纹
* @return 返回初始化信息
*/
// @GetMapping("/getLocalconfig")
// public AjaxResult getLocalconfig(String localid) {
// AjaxResult ajax = AjaxResult.success();
// ajax.put("localconfig", loginService.getLocalconfig(localid,IpUtils.getIpAddr()));
// ajax.put("oem", loginService.getOEM());
// ajax.put("hosplist", loginService.gethospList());
// return ajax;
// }
@GetMapping("/getLocalconfig")
public AjaxResult getLocalconfig(String localid) {
AjaxResult ajax = AjaxResult.success();
ajax.put("localconfig", loginService.getLocalconfig(localid,IpUtils.getIpAddr()));
ajax.put("oem", loginService.getOEM());
ajax.put("hosplist", loginService.gethospList());
return ajax;
}
}

48
pf_system/src/main/java/com/transitPlatForm/system/web/service/SysLoginService.java
View File

@ -8,6 +8,7 @@ import com.transitPlatForm.common.constant.Constants;
import com.transitPlatForm.common.constant.UserConstants;
import com.transitPlatForm.common.core.domain.entity.SysLoginParam;
import com.transitPlatForm.common.core.domain.entity.SysUser;
import com.transitPlatForm.common.core.domain.entity.reg.RegHospital;
import com.transitPlatForm.common.core.domain.model.LoginBody;
import com.transitPlatForm.common.core.domain.model.LoginUser;
import com.transitPlatForm.common.core.redis.RedisCache;
@ -17,6 +18,7 @@ import com.transitPlatForm.common.utils.DateUtils;
import com.transitPlatForm.common.utils.MessageUtils;
import com.transitPlatForm.common.utils.StringUtils;
import com.transitPlatForm.common.utils.ip.IpUtils;
import com.transitPlatForm.interfaceCommon.mapper.RegHospitalMapper;
import com.transitPlatForm.interfaceCommon.service.TokenService;
import com.transitPlatForm.interfaceCommon.utils.CommonUtil;
import com.transitPlatForm.system.factory.AsyncFactory;
@ -63,15 +65,17 @@ public class SysLoginService {
private CommonUtil commonUtil;
@Autowired
private SysUserMapper userMapper;
@Autowired
RegHospitalMapper regHospitalMapper;
// public Map<String, Object> getLocalconfig(String smac,String ip){
// String configvalue=commonUtil.getLocalconfig(smac);
// if(configvalue==null&&!"127.0.0.1".equals(ip)&&ip!=null) {
// configvalue=commonUtil.getLocalconfigByIP(ip);
// }
// Map<String, Object> map = new HashMap<>();
// if(configvalue!=null) {
// map = JSON.parseObject(configvalue, Map.class);
public Map<String, Object> getLocalconfig(String smac,String ip){
String configvalue=commonUtil.getLocalconfig(smac);
if(configvalue==null&&!"127.0.0.1".equals(ip)&&ip!=null) {
configvalue=commonUtil.getLocalconfigByIP(ip);
}
Map<String, Object> map = new HashMap<>();
if(configvalue!=null) {
map = JSON.parseObject(configvalue, Map.class);
// if(map!=null) {
// String yq=map.get("defaultinstr").toString();
// if(yq!=null) {
@ -79,9 +83,9 @@ public class SysLoginService {
// map.put("lisgroupid", lisgroupid);
// }
// }
// }
// return map;
// }
}
return map;
}
public Map<String,String> getOEM(){
Map<String,String> oem=new HashMap<>();
oem.put("compay",ruoyiConfig.getCompay());
@ -92,17 +96,17 @@ public class SysLoginService {
oem.put("copyrightyear",ruoyiConfig.getCopyrightYear());
return oem;
}
// public Object gethospList(){
// List<ComDict> comDictlist=commonUtil.getComDictList("HOS");
// List<Map<String, Object>> comDictlist0 = new ArrayList<>();
// for (ComDict table1 : comDictlist) {
// Map<String, Object> map= new HashMap<>();
// map.put("id",table1.getZddh());
// map.put("name",table1.getZdmc());
// comDictlist0.add(map);
// }
// return comDictlist0;
// }
public Object gethospList(){
List<RegHospital> regHospitalList = regHospitalMapper.selectHospitalAll();
List<Map<String, Object>> comDictlist0 = new ArrayList<>();
for (RegHospital regHospital : regHospitalList) {
Map<String, Object> map= new HashMap<>();
map.put("id",regHospital.getHospitalId());
map.put("name",regHospital.getHospitalName());
comDictlist0.add(map);
}
return comDictlist0;
}
/**
* 登录验证
* @return 结果

0
pf_system/src/main/resources/system/SysConfigMapper.xml → pf_system/src/main/resources/mapper/system/SysConfigMapper.xml
View File

0
pf_system/src/main/resources/system/SysDeptMapper.xml → pf_system/src/main/resources/mapper/system/SysDeptMapper.xml
View File

0
pf_system/src/main/resources/system/SysDictDataMapper.xml → pf_system/src/main/resources/mapper/system/SysDictDataMapper.xml
View File

0
pf_system/src/main/resources/system/SysDictTypeMapper.xml → pf_system/src/main/resources/mapper/system/SysDictTypeMapper.xml
View File

0
pf_system/src/main/resources/system/SysLogininforMapper.xml → pf_system/src/main/resources/mapper/system/SysLogininforMapper.xml
View File

0
pf_system/src/main/resources/system/SysMenuMapper.xml → pf_system/src/main/resources/mapper/system/SysMenuMapper.xml
View File

0
pf_system/src/main/resources/system/SysNoticeMapper.xml → pf_system/src/main/resources/mapper/system/SysNoticeMapper.xml
View File

0
pf_system/src/main/resources/system/SysPostMapper.xml → pf_system/src/main/resources/mapper/system/SysPostMapper.xml
View File

0
pf_system/src/main/resources/system/SysRoleDeptMapper.xml → pf_system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
View File

0
pf_system/src/main/resources/system/SysRoleMapper.xml → pf_system/src/main/resources/mapper/system/SysRoleMapper.xml
View File

0
pf_system/src/main/resources/system/SysRoleMenuMapper.xml → pf_system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
View File

0
pf_system/src/main/resources/system/SysUserMapper.xml → pf_system/src/main/resources/mapper/system/SysUserMapper.xml
View File

0
pf_system/src/main/resources/system/SysUserPostMapper.xml → pf_system/src/main/resources/mapper/system/SysUserPostMapper.xml
View File

0
pf_system/src/main/resources/system/SysUserRoleMapper.xml → pf_system/src/main/resources/mapper/system/SysUserRoleMapper.xml
View File

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegReportController.java
View File

@ -4,7 +4,7 @@ import com.transitPlatForm.common.core.controller.BaseController;
import com.transitPlatForm.common.core.page.TableDataInfo;
import com.transitPlatForm.transitPF.mapper.RegReportMapper;
import com.transitPlatForm.transitPF.pojo.DTO.RegItemVO;
import com.transitPlatForm.transitPF.pojo.RegTransitSample;
import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegTransitSampleController.java
View File

@ -5,7 +5,7 @@ import com.transitPlatForm.common.core.controller.BaseController;
import com.transitPlatForm.common.core.domain.Result;
import com.transitPlatForm.common.core.page.TableDataInfo;
import com.transitPlatForm.transitPF.pojo.DTO.SampleSignVO;
import com.transitPlatForm.transitPF.pojo.RegTransitSample;
import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample;
import com.transitPlatForm.transitPF.service.RegTransitSampleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/DiagnosisController.java
View File

@ -6,7 +6,7 @@ import com.transitPlatForm.common.core.domain.AjaxResult;
import com.transitPlatForm.common.core.page.TableDataInfo;
import com.transitPlatForm.common.enums.BusinessType;
import com.transitPlatForm.common.utils.poi.ExcelUtil;
import com.transitPlatForm.transitPF.pojo.RegDiagnosis;
import com.transitPlatForm.common.core.domain.entity.reg.RegDiagnosis;
import com.transitPlatForm.transitPF.service.RegDiagnosisService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/HospitalController.java
View File

@ -6,7 +6,7 @@ import com.transitPlatForm.common.core.domain.AjaxResult;
import com.transitPlatForm.common.core.page.TableDataInfo;
import com.transitPlatForm.common.enums.BusinessType;
import com.transitPlatForm.common.utils.poi.ExcelUtil;
import com.transitPlatForm.transitPF.pojo.RegHospital;
import com.transitPlatForm.common.core.domain.entity.reg.RegHospital;
import com.transitPlatForm.transitPF.service.RegHospitalService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/ItemclassController.java
View File

@ -6,7 +6,7 @@ import com.transitPlatForm.common.core.domain.AjaxResult;
import com.transitPlatForm.common.core.page.TableDataInfo;
import com.transitPlatForm.common.enums.BusinessType;
import com.transitPlatForm.common.utils.poi.ExcelUtil;
import com.transitPlatForm.transitPF.pojo.RegItemclass;
import com.transitPlatForm.common.core.domain.entity.reg.RegItemclass;
import com.transitPlatForm.transitPF.service.RegItemclassService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java
View File

@ -6,7 +6,7 @@ import com.transitPlatForm.common.core.domain.AjaxResult;
import com.transitPlatForm.common.core.page.TableDataInfo;
import com.transitPlatForm.common.enums.BusinessType;
import com.transitPlatForm.common.utils.poi.ExcelUtil;
import com.transitPlatForm.transitPF.pojo.RegDict;
import com.transitPlatForm.common.core.domain.entity.reg.RegDict;
import com.transitPlatForm.transitPF.service.RegDictService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDiagnosisMapper.java
View File

@ -1,6 +1,6 @@
package com.transitPlatForm.transitPF.mapper;
import com.transitPlatForm.transitPF.pojo.RegDiagnosis;
import com.transitPlatForm.common.core.domain.entity.reg.RegDiagnosis;
import java.util.List;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDictMapper.java
View File

@ -1,6 +1,6 @@
package com.transitPlatForm.transitPF.mapper;
import com.transitPlatForm.transitPF.pojo.RegDict;
import com.transitPlatForm.common.core.domain.entity.reg.RegDict;
import org.apache.ibatis.annotations.Param;
import java.util.List;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegItemclassMapper.java
View File

@ -1,6 +1,6 @@
package com.transitPlatForm.transitPF.mapper;
import com.transitPlatForm.transitPF.pojo.RegItemclass;
import com.transitPlatForm.common.core.domain.entity.reg.RegItemclass;
import java.util.List;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegReportMapper.java
View File

@ -1,7 +1,7 @@
package com.transitPlatForm.transitPF.mapper;
import com.transitPlatForm.transitPF.pojo.DTO.RegItemVO;
import com.transitPlatForm.transitPF.pojo.RegTransitSample;
import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample;
import java.util.List;
import java.util.Map;

4
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegTransitSampleMapper.java
View File

@ -1,7 +1,7 @@
package com.transitPlatForm.transitPF.mapper;
import com.transitPlatForm.transitPF.pojo.RegTransitSample;
import com.transitPlatForm.transitPF.pojo.RegTransitSampleDetail;
import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample;
import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSampleDetail;
import org.apache.ibatis.annotations.Param;
import java.util.List;

4
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/RegTransitSampleDTO.java
View File

@ -1,8 +1,8 @@
package com.transitPlatForm.transitPF.pojo.DTO;
import com.transitPlatForm.transitPF.pojo.RegTransitSample;
import com.transitPlatForm.transitPF.pojo.RegTransitSampleDetail;
import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample;
import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSampleDetail;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegDiagnosisService.java
View File

@ -1,6 +1,6 @@
package com.transitPlatForm.transitPF.service;
import com.transitPlatForm.transitPF.pojo.RegDiagnosis;
import com.transitPlatForm.common.core.domain.entity.reg.RegDiagnosis;
import java.util.List;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegDictService.java
View File

@ -1,6 +1,6 @@
package com.transitPlatForm.transitPF.service;
import com.transitPlatForm.transitPF.pojo.RegDict;
import com.transitPlatForm.common.core.domain.entity.reg.RegDict;
import java.util.List;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegHospitalService.java
View File

@ -1,6 +1,6 @@
package com.transitPlatForm.transitPF.service;
import com.transitPlatForm.transitPF.pojo.RegHospital;
import com.transitPlatForm.common.core.domain.entity.reg.RegHospital;
import java.util.List;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegItemclassService.java
View File

@ -1,6 +1,6 @@
package com.transitPlatForm.transitPF.service;
import com.transitPlatForm.transitPF.pojo.RegItemclass;
import com.transitPlatForm.common.core.domain.entity.reg.RegItemclass;
import java.util.List;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegTransitSampleService.java
View File

@ -2,7 +2,7 @@ package com.transitPlatForm.transitPF.service;
import com.transitPlatForm.common.core.domain.Result;
import com.transitPlatForm.transitPF.pojo.DTO.SampleSignVO;
import com.transitPlatForm.transitPF.pojo.RegTransitSample;
import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample;
import java.util.List;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDiagnosisServiceImpl.java
View File

@ -4,7 +4,7 @@ import com.transitPlatForm.common.constant.UserConstants;
import com.transitPlatForm.common.exception.ServiceException;
import com.transitPlatForm.common.utils.StringUtils;
import com.transitPlatForm.transitPF.mapper.RegDiagnosisMapper;
import com.transitPlatForm.transitPF.pojo.RegDiagnosis;
import com.transitPlatForm.common.core.domain.entity.reg.RegDiagnosis;
import com.transitPlatForm.transitPF.service.RegDiagnosisService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDictServiceImpl.java
View File

@ -4,7 +4,7 @@ import com.transitPlatForm.common.constant.UserConstants;
import com.transitPlatForm.common.exception.ServiceException;
import com.transitPlatForm.common.utils.StringUtils;
import com.transitPlatForm.transitPF.mapper.RegDictMapper;
import com.transitPlatForm.transitPF.pojo.RegDict;
import com.transitPlatForm.common.core.domain.entity.reg.RegDict;
import com.transitPlatForm.transitPF.service.RegDictService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

4
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegHospitalServiceImpl.java
View File

@ -3,8 +3,8 @@ package com.transitPlatForm.transitPF.service.impl;
import com.transitPlatForm.common.constant.UserConstants;
import com.transitPlatForm.common.exception.ServiceException;
import com.transitPlatForm.common.utils.StringUtils;
import com.transitPlatForm.transitPF.mapper.RegHospitalMapper;
import com.transitPlatForm.transitPF.pojo.RegHospital;
import com.transitPlatForm.interfaceCommon.mapper.RegHospitalMapper;
import com.transitPlatForm.common.core.domain.entity.reg.RegHospital;
import com.transitPlatForm.transitPF.service.RegHospitalService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

4
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java
View File

@ -6,8 +6,8 @@ import cn.hutool.json.JSONUtil;
import com.transitPlatForm.common.core.domain.Result;
import com.transitPlatForm.transitPF.mapper.RegTransitSampleMapper;
import com.transitPlatForm.transitPF.pojo.DTO.SampleSignVO;
import com.transitPlatForm.transitPF.pojo.RegTransitSample;
import com.transitPlatForm.transitPF.pojo.RegTransitSampleDetail;
import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample;
import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSampleDetail;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegItemclassServiceImpl.java
View File

@ -4,7 +4,7 @@ import com.transitPlatForm.common.constant.UserConstants;
import com.transitPlatForm.common.exception.ServiceException;
import com.transitPlatForm.common.utils.StringUtils;
import com.transitPlatForm.transitPF.mapper.RegItemclassMapper;
import com.transitPlatForm.transitPF.pojo.RegItemclass;
import com.transitPlatForm.common.core.domain.entity.reg.RegItemclass;
import com.transitPlatForm.transitPF.service.RegItemclassService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

2
pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java
View File

@ -12,7 +12,7 @@ import com.transitPlatForm.interfaceCommon.utils.CommonUtil;
import com.transitPlatForm.interfaceCommon.utils.LisInterfaceUtil;
import com.transitPlatForm.transitPF.mapper.RegTransitSampleMapper;
import com.transitPlatForm.transitPF.pojo.DTO.SampleSignVO;
import com.transitPlatForm.transitPF.pojo.RegTransitSample;
import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample;
import com.transitPlatForm.transitPF.service.RegTransitSampleService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

8
pf_transitPF/src/main/resources/mapper/RegItemclassMapper.xml
View File

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.transitPlatForm.transitPF.mapper.RegItemclassMapper">
<resultMap type="com.transitPlatForm.transitPF.pojo.RegItemclass" id="RegitemclassResult">
<resultMap type="com.transitPlatForm.common.core.domain.entity.reg.RegItemclass" id="RegitemclassResult">
<id property="itemclassId" column="itemclass_id" />
<result property="itemclassCode" column="itemclass_code" />
<result property="itemclassName" column="itemclass_name" />
@ -27,7 +27,7 @@
from Reg_itemclass
</sql>
<select id="selectItemclassList" parameterType="com.transitPlatForm.transitPF.pojo.RegItemclass" resultMap="RegitemclassResult">
<select id="selectItemclassList" parameterType="com.transitPlatForm.common.core.domain.entity.reg.RegItemclass" resultMap="RegitemclassResult">
<include refid="selectitemclassVo"/>
<where>
<if test="itemclassCode != null and itemclassCode != ''">
@ -67,7 +67,7 @@
where itemclass_code=#{itemclassCode}
</select>
<update id="updateItemclass" parameterType="com.transitPlatForm.transitPF.pojo.RegItemclass">
<update id="updateItemclass" parameterType="com.transitPlatForm.common.core.domain.entity.reg.RegItemclass">
update Reg_itemclass
<set>
<if test="itemclassCode != null and itemclassCode != ''">itemclass_code = #{itemclassCode},</if>
@ -86,7 +86,7 @@
where itemclass_id = #{itemclassId}
</update>
<insert id="insertItemclass" parameterType="com.transitPlatForm.transitPF.pojo.RegItemclass" useGeneratedKeys="true" keyProperty="itemclassId">
<insert id="insertItemclass" parameterType="com.transitPlatForm.common.core.domain.entity.reg.RegItemclass" useGeneratedKeys="true" keyProperty="itemclassId">
insert into Reg_itemclass(
<if test="itemclassId != null and itemclassId != 0">itemclass_id,</if>
<if test="itemclassCode != null and itemclassCode != ''">itemclass_code,</if>

6
pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.transitPlatForm.transitPF.mapper.RegTransitSampleMapper">
<select id="getRegTransitSample" resultType="com.transitPlatForm.transitPF.pojo.RegTransitSample">
<select id="getRegTransitSample" resultType="com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample">
select * from Reg_TransitSample
<where>
<if test="Barcode != null and Barcode !=''">and Barcode = #{Barcode}</if>
@ -24,7 +24,7 @@
</where>
</select>
<select id="getRegTransitSampleDetail" resultType="com.transitPlatForm.transitPF.pojo.RegTransitSampleDetail">
<select id="getRegTransitSampleDetail" resultType="com.transitPlatForm.common.core.domain.entity.reg.RegTransitSampleDetail">
select * from Reg_TransitSample_detail
<where>
<if test="Barcode != null and Barcode !=''">and Barcode = #{Barcode}</if>
@ -188,7 +188,7 @@
update reg_TransitSample set checkPUR = #{checkPUR} WHERE Barcode = #{barcode}
</update>
<select id="getRegTransitSampleSign" resultType="com.transitPlatForm.transitPF.pojo.RegTransitSample">
<select id="getRegTransitSampleSign" resultType="com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample">
<![CDATA[select * from Reg_TransitSample where Status in (select dict_code from reg_dict where dict_type = 'ZT' AND CAST(dict_code AS INT) < 50)]]>
<if test="SrcHospCode != null and SrcHospCode != ''"> and SrcHospCode = #{SrcHospCode}</if>
<if test="DstHospCode != null and DstHospCode != ''"> and DstHospCode = #{DstHospCode}</if>