物资分类带代码迁移

pom.xml

@@ -411,6 +411,7 @@
                 <includes>
                     <include>**/*.xml</include>
                 </includes>
+
             </resource>
             <resource>
                 <directory>src/main/resources</directory>

src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java

@@ -1,11 +1,15 @@
 package com.glxp.api.controller.basic;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.Log;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.BusinessType;
 import com.glxp.api.entity.basic.BasicHospTypeEntity;
+import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.req.basic.BasicHospTypeFilterRequest;
 import com.glxp.api.req.basic.BasicHospTypeRequest;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
@@ -13,7 +17,9 @@ import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.BasicHospTypeResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.service.basic.BasicHospTypeService;
+import com.glxp.api.service.basic.UdiRelevanceService;
 import com.glxp.api.util.StringUtils;
+import com.glxp.api.util.udi.FilterUdiUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,8 +36,6 @@ public class BasicHospTypeController {
     BasicHospTypeService basicHospTypeService;
 
 
-
-
     @GetMapping("/udiwms/basic/hosp/type/filter")
     public BaseResponse filterBasicUnitMaintain(BasicHospTypeFilterRequest basicHospTypeFilterRequest, BindingResult bindingResult) {
 
@@ -47,14 +51,20 @@ public class BasicHospTypeController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
-    @GetMapping("/udiwms/basic/hosp/type/menuList")
+    @PostMapping("/udiwms/basic/hosp/type/menuList")
-    public BaseResponse menuList(BasicHospTypeFilterRequest basicHospTypeFilterRequest, BindingResult bindingResult) {
+    public BaseResponse menuList(@RequestBody BasicHospTypeFilterRequest basicHospTypeFilterRequest, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<BasicHospTypeEntity> basicHospTypeEntities = basicHospTypeService.getMenuList(basicHospTypeFilterRequest);
+        return ResultVOUtils.success(basicHospTypeEntities);
+    }
+
+    @GetMapping("/udiwms/basic/hosp/type/getOneName")
+    public BaseResponse getOneName() {
 
+        BasicHospTypeEntity basicHospTypeEntities = basicHospTypeService.selectBasicHospTypeEntity();
         return ResultVOUtils.success(basicHospTypeEntities);
     }
 
@@ -65,7 +75,16 @@ public class BasicHospTypeController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        Boolean falg=basicHospTypeService.saveBasicHospType(basicHospTypeRequest);
+        if(StrUtil.isEmpty(basicHospTypeRequest.getName())){
+            return ResultVOUtils.error(999, "名字不能为空！");
+        }
+
+        Boolean falg=basicHospTypeService.checkName(basicHospTypeRequest,1);
+        if(falg==false){
+            return ResultVOUtils.error(999, "院内分类名字已存在！");
+        }
+
+        falg = basicHospTypeService.saveBasicHospType(basicHospTypeRequest);
         if (!falg) {
             return ResultVOUtils.error(999, "插入失败！");
         }
@@ -74,13 +93,26 @@ public class BasicHospTypeController {
 
 
     @PostMapping("/udiwms/basic/hosp/type/update")
+    @Log(title = "单据管理", businessType = BusinessType.UPDATE)
     public BaseResponse update(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
+        if(StrUtil.isEmpty(basicHospTypeRequest.getName())){
+            return ResultVOUtils.error(999, "名字不能为空！");
+        }
+
+        if(basicHospTypeRequest.getCode().equals(basicHospTypeRequest.getParentCode())){
+            return ResultVOUtils.error(999, "上级菜单不能选择自己！");
+        }
+
+        Boolean falg=basicHospTypeService.checkName(basicHospTypeRequest,2);
+        if(falg==false){
+            return ResultVOUtils.error(999, "院内分类名字已存在！");
+        }
 
-        Boolean falg=basicHospTypeService.updateBasicHospType(basicHospTypeRequest);
+        falg = basicHospTypeService.updateBasicHospType(basicHospTypeRequest);
         if (!falg) {
             return ResultVOUtils.error(999, "更新失败！");
         }
@@ -88,6 +120,7 @@ public class BasicHospTypeController {
     }
 
     @GetMapping("/udiwms/basic/hosp/type/delect")
+    @Log(title = "单据管理", businessType = BusinessType.DELETE)
     public BaseResponse delect(BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
@@ -118,10 +151,33 @@ public class BasicHospTypeController {
         return ResultVOUtils.success();
     }
 
+    @Resource
+    UdiRelevanceService udiRelevanceService;
+
     @GetMapping("/udiwms/basic/hosp/type/bindList")
     public BaseResponse bindList(FilterUdiRelRequest filterUdiRelRequest) {
 
+        if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) {
+            UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiRelRequest.getUdiCode());
+            if (udiEntity != null) {
+                filterUdiRelRequest.setNameCode(udiEntity.getUdi());
+                filterUdiRelRequest.setUnionCode(udiEntity.getUdi());
+            }
+        }
+        //如果输入DI标识，精确找到不同层级对应的产品信息
+        if (StrUtil.isNotEmpty(filterUdiRelRequest.getUnionCode())) {
+            FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest();
+            filterUdiInfoRequest.setNameCode(filterUdiRelRequest.getUnionCode());
+            List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
+            if (temps != null && temps.size() > 0) {
+                filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid());
+                filterUdiRelRequest.setNameCode(filterUdiInfoRequest.getNameCode());
+                filterUdiRelRequest.setUnionCode(null);
+            }
+        } else {
+            //只查找主标识产品信息
             filterUdiRelRequest.setDiType(1);
+        }
         List<UdiRelevanceResponse> udiRelevanceResponses = basicHospTypeService.filterUdiGp(filterUdiRelRequest);
         PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -132,6 +188,7 @@ public class BasicHospTypeController {
 
 
     @PostMapping("/udiwms/basic/hosp/type/unbindRel")
+    @Log(title = "单据管理", businessType = BusinessType.UPDATE)
     public BaseResponse unbindRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {

src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java

@@ -15,5 +15,7 @@ public interface BasicHospTypeDao extends BaseMapperPlus<BasicHospTypeDao, Basic
 
     List<BasicHospTypeResponse> getTreeList();
 
+    List<BasicHospTypeEntity> selectLowTypeAll(@Param("code") String code);
+
 
 }

src/main/java/com/glxp/api/req/basic/BasicHospTypeFilterRequest.java

@@ -10,4 +10,6 @@ import java.util.List;
 public class BasicHospTypeFilterRequest extends ListPageRequest {
 
   private String name;
+  private Integer type;
+  private String code;
 }

src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java

@@ -17,6 +17,8 @@ public interface BasicHospTypeService extends IService<BasicHospTypeEntity> {
 
     List<BasicHospTypeEntity> getMenuList(BasicHospTypeFilterRequest basicHospTypeFilterRequest);
 
+    BasicHospTypeEntity selectBasicHospTypeEntity();
+
     Boolean saveBasicHospType(BasicHospTypeRequest basicHospTypeRequest);
 
     boolean updateBasicHospType(BasicHospTypeRequest basicHospTypeRequest);
@@ -31,5 +33,7 @@ public interface BasicHospTypeService extends IService<BasicHospTypeEntity> {
 
     List<UdiRelevanceResponse> filterUdiGp(FilterUdiRelRequest filterUdiRelRequest);
 
+    Boolean checkName(BasicHospTypeRequest basicHospTypeRequest, Integer type);
+
 
 }

src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java

@@ -17,14 +17,17 @@ import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.basic.BasicHospTypeService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao, BasicHospTypeEntity> implements BasicHospTypeService {
 
     @Resource
@@ -38,8 +41,6 @@ public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao,Basic
     UdiRelevanceDao udiRelevanceDao;
 
 
-
-
     @Override
     public List<BasicHospTypeEntity> filterHospTypeList(BasicHospTypeFilterRequest basicHospTypeFilterRequest) {
         if (basicHospTypeFilterRequest == null) {
@@ -59,11 +60,25 @@ public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao,Basic
 
     @Override
     public List<BasicHospTypeEntity> getMenuList(BasicHospTypeFilterRequest basicHospTypeFilterRequest) {
+
         QueryWrapper<BasicHospTypeEntity> ew = new QueryWrapper<>();
+        ew.ne("code", 10000);
+        if (basicHospTypeFilterRequest.getType() != null && basicHospTypeFilterRequest.getType() == 1 && StrUtil.isNotEmpty(basicHospTypeFilterRequest.getCode())) {
+            List<BasicHospTypeEntity> basicHospTypeEntityList = basicHospTypeDao.selectLowTypeAll(basicHospTypeFilterRequest.getCode());
+            List<Integer> ids = basicHospTypeEntityList.stream().map(BasicHospTypeEntity::getId).collect(Collectors.toList());
+            ew.notIn("id", ids);
+        }
         List<BasicHospTypeEntity> data = basicHospTypeDao.selectList(ew);
         return data;
     }
 
+    @Override
+    public BasicHospTypeEntity selectBasicHospTypeEntity() {
+        QueryWrapper<BasicHospTypeEntity> ew = new QueryWrapper<>();
+        ew.eq("code", 10000);
+        return basicHospTypeDao.selectOne(ew);
+    }
+
     @Override
     public Boolean saveBasicHospType(BasicHospTypeRequest basicHospTypeRequest) {
         boolean falg = true;
@@ -176,4 +191,27 @@ public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao,Basic
         List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiGp(filterUdiRelRequest);
         return data;
     }
+
+    @Override
+    public Boolean checkName(BasicHospTypeRequest basicHospTypeRequest, Integer type) {
+        Long sum = null;
+        //1添加
+        if (type == 1) {
+            //查看名字是不是重复
+            QueryWrapper<BasicHospTypeEntity> ew = new QueryWrapper<>();
+            ew.eq("name", basicHospTypeRequest.getName());
+            sum = basicHospTypeDao.selectCount(ew);
+        } else {
+            QueryWrapper<BasicHospTypeEntity> ew = new QueryWrapper<>();
+            ew.eq("name", basicHospTypeRequest.getName());
+            ew.ne("id", basicHospTypeRequest.getId());
+            sum = basicHospTypeDao.selectCount(ew);
+        }
+        if (sum > 0) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
 }

src/main/java/com/glxp/api/task/SyncHeartTask.java

@@ -20,8 +20,8 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 
 
-@Component
+//@Component
-@EnableScheduling
+//@EnableScheduling
 public class SyncHeartTask implements SchedulingConfigurer {
 
     final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class);

src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml

@@ -24,5 +24,25 @@
     SELECT id, code,name as label,parentCode FROM basic_hosp_type ORDER BY id DESC
   </select>
 
+  <select id="selectLowTypeAll" parameterType="java.lang.String" resultType="com.glxp.api.entity.basic.BasicHospTypeEntity">
+    WITH recursive table_a AS (
+    SELECT
+    *
+    FROM
+    basic_hosp_type ta
+    WHERE
+    code = #{code}
+    UNION ALL
+    SELECT
+    tb.*
+    FROM
+    basic_hosp_type tb
+    INNER JOIN table_a ON table_a.CODE = tb.parentCode
+    ) SELECT
+    *
+    FROM
+    table_a
+  </select>
+
 
 </mapper>