diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegDiagnosis.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegDiagnosis.java similarity index 93% rename from pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegDiagnosis.java rename to pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegDiagnosis.java index 62480cd..cf5c66b 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegDiagnosis.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegDiagnosis.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegDict.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegDict.java similarity index 94% rename from pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegDict.java rename to pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegDict.java index 106bc61..6e9b592 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegDict.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegDict.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegHospital.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegHospital.java similarity index 94% rename from pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegHospital.java rename to pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegHospital.java index 74ffeea..ddcab30 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegHospital.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegHospital.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegItemclass.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegItemclass.java similarity index 95% rename from pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegItemclass.java rename to pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegItemclass.java index 6bc2d6a..e251df7 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegItemclass.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegItemclass.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegTransitSample.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSample.java similarity index 98% rename from pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegTransitSample.java rename to pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSample.java index 65ae533..303bf28 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegTransitSample.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSample.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegTransitSampleDetail.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSampleDetail.java similarity index 94% rename from pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegTransitSampleDetail.java rename to pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSampleDetail.java index 3a0ac33..04b6439 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/RegTransitSampleDetail.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegTransitSampleDetail.java @@ -1,4 +1,4 @@ -package com.transitPlatForm.transitPF.pojo; +package com.transitPlatForm.common.core.domain.entity.reg; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegHospitalMapper.java b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegHospitalMapper.java similarity index 93% rename from pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegHospitalMapper.java rename to pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegHospitalMapper.java index 30212a7..f85ac20 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegHospitalMapper.java +++ b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/RegHospitalMapper.java @@ -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; diff --git a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/utils/CommonUtil.java b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/utils/CommonUtil.java index 02891e8..7fa560e 100644 --- a/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/utils/CommonUtil.java +++ b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/utils/CommonUtil.java @@ -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); + } } diff --git a/pf_transitPF/src/main/resources/mapper/RegHospitalMapper.xml b/pf_interfaceCommon/src/main/resources/mapper/RegHospitalMapper.xml similarity index 98% rename from pf_transitPF/src/main/resources/mapper/RegHospitalMapper.xml rename to pf_interfaceCommon/src/main/resources/mapper/RegHospitalMapper.xml index a43114c..14db5bc 100644 --- a/pf_transitPF/src/main/resources/mapper/RegHospitalMapper.xml +++ b/pf_interfaceCommon/src/main/resources/mapper/RegHospitalMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/pf_system/pom.xml b/pf_system/pom.xml index 5bbb447..d667142 100644 --- a/pf_system/pom.xml +++ b/pf_system/pom.xml @@ -25,7 +25,11 @@ com.transitPlatForm pf_interfaceCommon - 1.0 + + + + com.transitPlatForm + pf_transitPF diff --git a/pf_system/src/main/java/com/transitPlatForm/system/web/controller/system/SysLoginController.java b/pf_system/src/main/java/com/transitPlatForm/system/web/controller/system/SysLoginController.java index 852b5d2..d6289f6 100644 --- a/pf_system/src/main/java/com/transitPlatForm/system/web/controller/system/SysLoginController.java +++ b/pf_system/src/main/java/com/transitPlatForm/system/web/controller/system/SysLoginController.java @@ -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; + } } diff --git a/pf_system/src/main/java/com/transitPlatForm/system/web/service/SysLoginService.java b/pf_system/src/main/java/com/transitPlatForm/system/web/service/SysLoginService.java index 58547f2..4f8836b 100644 --- a/pf_system/src/main/java/com/transitPlatForm/system/web/service/SysLoginService.java +++ b/pf_system/src/main/java/com/transitPlatForm/system/web/service/SysLoginService.java @@ -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 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 map = new HashMap<>(); -// if(configvalue!=null) { -// map = JSON.parseObject(configvalue, Map.class); + public Map 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 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 getOEM(){ Map 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 comDictlist=commonUtil.getComDictList("HOS"); -// List> comDictlist0 = new ArrayList<>(); -// for (ComDict table1 : comDictlist) { -// Map map= new HashMap<>(); -// map.put("id",table1.getZddh()); -// map.put("name",table1.getZdmc()); -// comDictlist0.add(map); -// } -// return comDictlist0; -// } + public Object gethospList(){ + List regHospitalList = regHospitalMapper.selectHospitalAll(); + List> comDictlist0 = new ArrayList<>(); + for (RegHospital regHospital : regHospitalList) { + Map map= new HashMap<>(); + map.put("id",regHospital.getHospitalId()); + map.put("name",regHospital.getHospitalName()); + comDictlist0.add(map); + } + return comDictlist0; + } /** * 登录验证 * @return 结果 diff --git a/pf_system/src/main/resources/system/SysConfigMapper.xml b/pf_system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 100% rename from pf_system/src/main/resources/system/SysConfigMapper.xml rename to pf_system/src/main/resources/mapper/system/SysConfigMapper.xml diff --git a/pf_system/src/main/resources/system/SysDeptMapper.xml b/pf_system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 100% rename from pf_system/src/main/resources/system/SysDeptMapper.xml rename to pf_system/src/main/resources/mapper/system/SysDeptMapper.xml diff --git a/pf_system/src/main/resources/system/SysDictDataMapper.xml b/pf_system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 100% rename from pf_system/src/main/resources/system/SysDictDataMapper.xml rename to pf_system/src/main/resources/mapper/system/SysDictDataMapper.xml diff --git a/pf_system/src/main/resources/system/SysDictTypeMapper.xml b/pf_system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 100% rename from pf_system/src/main/resources/system/SysDictTypeMapper.xml rename to pf_system/src/main/resources/mapper/system/SysDictTypeMapper.xml diff --git a/pf_system/src/main/resources/system/SysLogininforMapper.xml b/pf_system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 100% rename from pf_system/src/main/resources/system/SysLogininforMapper.xml rename to pf_system/src/main/resources/mapper/system/SysLogininforMapper.xml diff --git a/pf_system/src/main/resources/system/SysMenuMapper.xml b/pf_system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 100% rename from pf_system/src/main/resources/system/SysMenuMapper.xml rename to pf_system/src/main/resources/mapper/system/SysMenuMapper.xml diff --git a/pf_system/src/main/resources/system/SysNoticeMapper.xml b/pf_system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 100% rename from pf_system/src/main/resources/system/SysNoticeMapper.xml rename to pf_system/src/main/resources/mapper/system/SysNoticeMapper.xml diff --git a/pf_system/src/main/resources/system/SysPostMapper.xml b/pf_system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 100% rename from pf_system/src/main/resources/system/SysPostMapper.xml rename to pf_system/src/main/resources/mapper/system/SysPostMapper.xml diff --git a/pf_system/src/main/resources/system/SysRoleDeptMapper.xml b/pf_system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 100% rename from pf_system/src/main/resources/system/SysRoleDeptMapper.xml rename to pf_system/src/main/resources/mapper/system/SysRoleDeptMapper.xml diff --git a/pf_system/src/main/resources/system/SysRoleMapper.xml b/pf_system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 100% rename from pf_system/src/main/resources/system/SysRoleMapper.xml rename to pf_system/src/main/resources/mapper/system/SysRoleMapper.xml diff --git a/pf_system/src/main/resources/system/SysRoleMenuMapper.xml b/pf_system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 100% rename from pf_system/src/main/resources/system/SysRoleMenuMapper.xml rename to pf_system/src/main/resources/mapper/system/SysRoleMenuMapper.xml diff --git a/pf_system/src/main/resources/system/SysUserMapper.xml b/pf_system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 100% rename from pf_system/src/main/resources/system/SysUserMapper.xml rename to pf_system/src/main/resources/mapper/system/SysUserMapper.xml diff --git a/pf_system/src/main/resources/system/SysUserPostMapper.xml b/pf_system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 100% rename from pf_system/src/main/resources/system/SysUserPostMapper.xml rename to pf_system/src/main/resources/mapper/system/SysUserPostMapper.xml diff --git a/pf_system/src/main/resources/system/SysUserRoleMapper.xml b/pf_system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 100% rename from pf_system/src/main/resources/system/SysUserRoleMapper.xml rename to pf_system/src/main/resources/mapper/system/SysUserRoleMapper.xml diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegReportController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegReportController.java index 9868896..ce77a2e 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegReportController.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegReportController.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegTransitSampleController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegTransitSampleController.java index 644b44f..2fc3a0b 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegTransitSampleController.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegTransitSampleController.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/DiagnosisController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/DiagnosisController.java index 431cf7e..1311e8a 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/DiagnosisController.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/DiagnosisController.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/HospitalController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/HospitalController.java index aaf47c8..1ccbdde 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/HospitalController.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/HospitalController.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/ItemclassController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/ItemclassController.java index 3125361..3542819 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/ItemclassController.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/ItemclassController.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java index 323f597..a03bcfd 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/dict/RegDictController.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDiagnosisMapper.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDiagnosisMapper.java index 1bf503c..808de3e 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDiagnosisMapper.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDiagnosisMapper.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDictMapper.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDictMapper.java index e0978a8..49fd185 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDictMapper.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegDictMapper.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegItemclassMapper.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegItemclassMapper.java index b9e0f57..fd3228a 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegItemclassMapper.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegItemclassMapper.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegReportMapper.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegReportMapper.java index 0446ba1..409fb8a 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegReportMapper.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegReportMapper.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegTransitSampleMapper.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegTransitSampleMapper.java index 6379c99..f6675b5 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegTransitSampleMapper.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegTransitSampleMapper.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/RegTransitSampleDTO.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/RegTransitSampleDTO.java index f5f38b4..f49acb3 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/RegTransitSampleDTO.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/RegTransitSampleDTO.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegDiagnosisService.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegDiagnosisService.java index 390c03f..37194f5 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegDiagnosisService.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegDiagnosisService.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegDictService.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegDictService.java index 0182a0b..2deb4a4 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegDictService.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegDictService.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegHospitalService.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegHospitalService.java index 5d3d21f..860a503 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegHospitalService.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegHospitalService.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegItemclassService.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegItemclassService.java index 6f8e21d..85ceab0 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegItemclassService.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegItemclassService.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegTransitSampleService.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegTransitSampleService.java index 9348779..096a188 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegTransitSampleService.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegTransitSampleService.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDiagnosisServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDiagnosisServiceImpl.java index a75bd9f..8498f3a 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDiagnosisServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDiagnosisServiceImpl.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDictServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDictServiceImpl.java index 01a8e03..2903c04 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDictServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegDictServiceImpl.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegHospitalServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegHospitalServiceImpl.java index da29fbb..aa8cf5a 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegHospitalServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegHospitalServiceImpl.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java index e19d5ae..79be208 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegItemclassServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegItemclassServiceImpl.java index 8c3cd06..dcdaf77 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegItemclassServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegItemclassServiceImpl.java @@ -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; diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java index 10aafcd..a5e6088 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java @@ -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; diff --git a/pf_transitPF/src/main/resources/mapper/RegItemclassMapper.xml b/pf_transitPF/src/main/resources/mapper/RegItemclassMapper.xml index ef75c58..51365dd 100644 --- a/pf_transitPF/src/main/resources/mapper/RegItemclassMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegItemclassMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -27,7 +27,7 @@ from Reg_itemclass - @@ -67,7 +67,7 @@ where itemclass_code=#{itemclassCode} - + update Reg_itemclass itemclass_code = #{itemclassCode}, @@ -86,7 +86,7 @@ where itemclass_id = #{itemclassId} - + insert into Reg_itemclass( itemclass_id, itemclass_code, diff --git a/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml b/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml index 2198625..842bd04 100644 --- a/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegTransitSampleMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select * from Reg_TransitSample and Barcode = #{Barcode} @@ -24,7 +24,7 @@ - select * from Reg_TransitSample_detail and Barcode = #{Barcode} @@ -188,7 +188,7 @@ update reg_TransitSample set checkPUR = #{checkPUR} WHERE Barcode = #{barcode} - and SrcHospCode = #{SrcHospCode} and DstHospCode = #{DstHospCode}