Merge branch 'master' of git.yfzx.zjtys.com.cn:912-system/monitor/inspect

src/main/java/com/zjty/inspect/controller/InspectController.java

@@ -303,11 +303,11 @@ public class InspectController {
                     }
                     technologyContents.add(technologyContent);
                 }
-                if (Objects.equals(key, "Microsoft CSS extensions(不支持)")) {
+                if (Objects.equals(key, "前端CSS(不支持)")) {
                     css = technologyContents.size();
-                } else if (Objects.equals(key, "Microsoft API extensions(不支持)")) {
+                } else if (Objects.equals(key, "前端API(不支持)")) {
                     api = technologyContents.size();
-                } else if (Objects.equals(key, "Microsoft JavaScript extensions(不支持)")) {
+                } else if (Objects.equals(key, "前端JS(不支持)")) {
                     plugIn = technologyContents.size();
                 } else if (Objects.equals(key, "JNI(不支持)")) {
                     jni = technologyContents.size();

src/main/java/com/zjty/inspect/dao/RuleDao.java

@@ -36,6 +36,7 @@ public interface RuleDao extends JpaRepository<Rule,String>,JpaSpecificationExec
      * @return
      */
     List<Rule> findAllByTechnologyIdIn(List<String> ids);
+    List<Rule> findAllByTechnologyId(String id);
 
     List<Rule> findAllByTechnologyIdEqualsAndTargetEquals(String techId,String target);
 }

src/main/java/com/zjty/inspect/service/impl/TechnologyServiceImpl.java

 package com.zjty.inspect.service.impl;
 
+import com.zjty.inspect.dao.RuleDao;
 import com.zjty.inspect.dao.TechnologyDao;
+import com.zjty.inspect.entity.Rule;
 import com.zjty.inspect.entity.TechnologyQo;
 import com.zjty.inspect.entity.Technology;
 import com.zjty.inspect.service.TechnologyService;
@@ -31,6 +33,8 @@ import java.util.Optional;
 @Transactional(rollbackFor = Exception.class)
 public class TechnologyServiceImpl implements TechnologyService {
 
+    @Autowired
+    private RuleDao ruleDao;
     @Autowired
     private TechnologyDao technologyDao;
 
@@ -96,6 +100,12 @@ public class TechnologyServiceImpl implements TechnologyService {
      */
     @Override
     public void update(Technology technology) {
+        List<Rule> rules = ruleDao.findAllByTechnologyId(technology.getId());
+        for (Rule rule : rules) {
+            rule.setTechnologyName(technology.getTechnologyName());
+        }
+        ruleDao.saveAll(rules);
+
         technologyDao.save(technology);
     }
 

src/main/java/com/zjty/inspect/utils/WorkLoadUtil.java

@@ -479,10 +479,10 @@ public class WorkLoadUtil {
         }
         for(TechnologyReport technologyReport:report.getTechnologyList().getTechnologyReports()){
             int size = technologyReport.getTechnologyContents().size();
-            if(technologyReport.getTechnology().contains("国产化依赖(支持)")){
+            if(technologyReport.getTechnology().contains("内部依赖(支持)")){
                 size = report.getDifficultyAssessment().getMiddlewareDifficulty().getDependOnNum();
             }
-            string .append( technologyReport.getTechnology()+"修改项"+size+"个，");
+            string .append( technologyReport.getTechnology()+(technologyReport.getTechnology().contains("不支持")?"修改项":"")+size+"个，");
         }
         report.getTechnologyList().setDes(string.substring(0,string.length()-1)+"。");
         String type = "";