Merge branch 'dev_supervise' into dev

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/ClassifyDTO.java

@@ -10,6 +10,8 @@ import java.util.List;
 @Data
 public class ClassifyDTO extends ClassifyEntity {
 
+	private String ids;
+
 	private Integer isPid;
 
 	private List<PointsEntity> pointsEntities = new ArrayList<>();

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/controller/ClassifyController.java

@@ -115,8 +115,8 @@ public class ClassifyController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(classifyService.deleteLogic(Func.toLongList(ids)));
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestBody ClassifyDTO classifyDTO) {
+		return R.status(classifyService.deleteLogic(Func.toLongList(classifyDTO.getIds())));
 	}
 
 
@@ -192,10 +192,10 @@ public class ClassifyController extends BladeController {
 	@PostMapping("/selectParentCalssifyList")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "查询指标分类", notes = "传入indicatorsDTO")
-	public R selectParentCalssifyList(@RequestBody ClassifyDTO classifyDTO) {
+	public R selectParentCalssifyList() {
 		String method = "##############selectParentCalssifyList: ";
-		log.info(method+"查询指标分类 参数={}",classifyDTO);
-
+		log.info(method+"查询指标分类 ");
+		ClassifyDTO classifyDTO = new ClassifyDTO();
 		try{
 
 			return classifyService.selectParentCalssifyList(classifyDTO);

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml

@@ -24,6 +24,7 @@
         select *
         from sup_classify
         <where>
+            and is_deleted = 0
             <if test="param.isPid != null and param.isPid ==1 ">
                 and p_id = 0
             </if>
@@ -44,12 +45,14 @@
         select *
         from sup_classify
         where p_id = 0
+          and is_deleted = 0
     </select>
 
     <select id="selectChildCalssifyList" resultType="com.logpm.supervise.entity.ClassifyEntity">
         select *
         from sup_classify
         where p_id = #{param.pId}
+          and is_deleted = 0
     </select>
     <select id="selectAllClassifyList" resultType="com.logpm.supervise.vo.api.ClassifyApiVO">
         SELECT * FROM sup_classify WHERE is_deleted = 0

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java

@@ -76,10 +76,12 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 	public IPage<ClassifyEntity> pageList(IPage<Object> page, Map<String, Object> classify) {
 		Long pId = (Long) classify.get("pId");
 		String name = (String) classify.get("name");
+		String isPid = (String) classify.get("isPid");
 
 		ClassifyDTO classifyDTO = new ClassifyDTO();
 		classifyDTO.setPId(pId);
 		classifyDTO.setName(name);
+		classifyDTO.setIsPid(Integer.parseInt(isPid));
 
 		IPage<ClassifyEntity> pages = baseMapper.pageList(page,classifyDTO);
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.exception.CustomerException;
+import org.springblade.core.redis.lock.RedisLock;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.web.bind.annotation.*;
@@ -1542,6 +1543,7 @@ public class CarsLoadController {
 	}
 
 
+	@RedisLock()
 	@ResponseBody
 	@PostMapping("/batchUnload")
 	@ApiOperationSupport(order = 1)