打分复制

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/ScenePackageController.java

@@ -12,9 +12,9 @@ import com.css.simulation.resource.scene.service.ScenePackageService;
 import com.css.simulation.resource.system.service.ParameterService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,13 +28,13 @@ public class ScenePackageController {
 
     @Resource
     ScenePackageService scenePackageService;
-    @Autowired
+    @Resource
     ParameterService parameterService;
 
     //查询主表列表
     @PostMapping("/queryScenePackageList")
     @ResponseBody
-    public ResponseBodyVO<List<ScenePackageVO>> queryScenePackageList(@RequestBody ScenePackageParam parms) {
+    public ResponseBodyVO<PageInfo<ScenePackageVO>> queryScenePackageList(@RequestBody ScenePackageParam parms) {
         PageUtil.setPageInfo(parms);
         List<ScenePackagePO> list = scenePackageService.queryScenePackageList(parms);
         PageInfo<ScenePackagePO> objectPageInfo = new PageInfo<>(list);
@@ -44,9 +44,9 @@ public class ScenePackageController {
             BeanUtils.copyProperties(po, vo);
             list1.add(vo);
         }
-        PageInfo pageInfo = new PageInfo<>(list1);
+        PageInfo<ScenePackageVO> pageInfo = new PageInfo<>(list1);
         pageInfo.setTotal(objectPageInfo.getTotal());
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, pageInfo);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, pageInfo);
     }
 
 

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/ScenePackageService.java

@@ -66,9 +66,9 @@ public class ScenePackageService {
         List<ScenePackageSublistPO> treeList = instShareListTree(listSublictTree, uuId, uuId, poList, "0", 1);
         //校验指标名称唯一
         if (treeList == null || treeList.size() < 1) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "指标数据为空，请检查");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "指标数据为空，请检查");
         }
-        if (treeList != null && treeList.size() > 1) {
+        if (treeList.size() > 1) {
             Set set = new HashSet();
             Map map = new HashMap<>();
             for (ScenePackageSublistPO vo : treeList) {
@@ -80,13 +80,13 @@ public class ScenePackageService {
                 }
             }
             if (ObjectUtil.isNotNull(set)) {
-                return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "该条数据中指标名称:" + set + "重复，请检查");
+                return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "该条数据中指标名称:" + set + "重复，请检查");
             }
         }
         scenePackageMapper.saveScenePackage(po);
         scenePackageSublistMapper.saveScenePackageSublistAll(treeList);
         LogUtil.insert();
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
     //查询测试包主表列表
@@ -95,8 +95,7 @@ public class ScenePackageService {
         if (params != null && params.getShare() != null && params.getShare().equals("0")) {
             params.setCreateUserId(AuthUtil.getCurrentUserId());
         }
-        List<ScenePackagePO> list = scenePackageMapper.queryScenePackageList(params);
-        return list;
+        return scenePackageMapper.queryScenePackageList(params);
     }
 
     //修改主表数据
@@ -128,9 +127,9 @@ public class ScenePackageService {
         List<ScenePackageSublistPO> poList = new ArrayList<>();
         List<ScenePackageSublistPO> treeList = instShareListTree(listSublictTree, po.getPackageId(), po.getPackageId(), poList, "0", 1);
         if (treeList == null || treeList.size() < 1) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "指标数据为空，请检查");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "指标数据为空，请检查");
         }
-        if (treeList != null && treeList.size() > 1) {
+        if (treeList.size() > 1) {
             Set set = new HashSet();
             Map map = new HashMap<>();
             for (ScenePackageSublistPO vo : treeList) {
@@ -142,14 +141,14 @@ public class ScenePackageService {
                 }
             }
             if (ObjectUtil.isNotNull(set)) {
-                return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "该条数据中指标名称:" + set + "重复，请检查");
+                return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "该条数据中指标名称:" + set + "重复，请检查");
             }
         }
         scenePackageMapper.updateScenePackage(po);
         scenePackageSublistMapper.deleteScenePackageSublist(po.getPackageId());
         scenePackageSublistMapper.saveScenePackageSublistAll(treeList);
         LogUtil.update();
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
     //删除测试包
@@ -183,15 +182,14 @@ public class ScenePackageService {
         root.setTreeNode(vo.getTreeNode());
         scenePackageSublistVOS.add(0, root);
         //list转tree
-        List<ScenePackageSublistVO> tree = listToTree(scenePackageSublistVOS);
-        return tree;
+        return listToTree(scenePackageSublistVOS);
     }
 
     /**
      * list转tree
      */
     public static List<ScenePackageSublistVO> listToTree(List<ScenePackageSublistVO> list) {
-        List<ScenePackageSublistVO> treeList = new ArrayList<ScenePackageSublistVO>();
+        List<ScenePackageSublistVO> treeList = new ArrayList<>();
         for (ScenePackageSublistVO vo : list) {
             if ("0".equals(vo.getParentId())) {
                 treeList.add(findChildren(vo, list));
@@ -207,7 +205,7 @@ public class ScenePackageService {
         for (ScenePackageSublistVO node : list) {
             if (vo.getId().equals(node.getParentId())) {
                 if (vo.getChildren() == null || vo.getChildren().size() == 0) {
-                    vo.setChildren(new ArrayList<ScenePackageSublistVO>());
+                    vo.setChildren(new ArrayList<>());
                 }
                 vo.getChildren().add(findChildren(node, list));
             }
@@ -261,7 +259,7 @@ public class ScenePackageService {
         po.setPackageName(scenePackagePO.getPackageName());
         List<ScenePackageNewVO> listName = scenePackageMapper.queryByPackageName(po);
         if (listName != null && listName.size() > 0) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "测试包名称:" + listName.get(0).getPackageName() + "的测试包已存在，请检查");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "测试包名称:" + listName.get(0).getPackageName() + "的测试包已存在，请检查");
         }
         BeanUtils.copyProperties(scenePackagePO, po);
         po.setCreateTime(TimeUtil.getNowForMysql());
@@ -287,7 +285,7 @@ public class ScenePackageService {
                 }
             }
             if (ObjectUtil.isNotNull(set)) {
-                return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "该条数据中指标名称:" + set + "重复，请检查");
+                return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "该条数据中指标名称:" + set + "重复，请检查");
             }
         }
         scenePackageMapper.saveScenePackage(po);