变更

industry-admin/src/main/java/com/industry/web/controller/work/IndustryMaterialController.java

@@ -18,6 +18,7 @@ import com.industry.work.domain.dto.IndustryMaterialDto;
 import com.industry.work.domain.vo.IndustryMaterialVo;
 import com.industry.work.service.IIndustryMaterialService;
 import com.industry.work.service.IIndustryStepService;
+import com.industry.work.service.IMomService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +54,9 @@ public class IndustryMaterialController extends BaseController
     @Autowired
     private IIndustryStepService industryStepService;
 
+    @Autowired
+    private IMomService momService;
+
 
 
     @Autowired
@@ -216,7 +220,7 @@ public class IndustryMaterialController extends BaseController
                 }
                 industryMaterialService.updateIndustryMaterial(industryMaterial);
                 // TODO 加入ip地址请求
-                // HttpUtils.dataPost()
+                momService.processPowerDown(industryMaterial);
             }
 
         }

industry-admin/src/main/java/com/industry/web/controller/work/IndustryStepController.java

@@ -178,7 +178,8 @@ public class IndustryStepController extends BaseController
     @GetMapping("/check/{batchId}")
     public AjaxResult check(@PathVariable Long batchId)
     {
-        return AjaxResult.success(industryStepService.finishCheck(batchId));
+        Long result =  industryStepService.finishCheck(batchId);
+        return AjaxResult.success(result);
     }
     /**
      * 结束检查

industry-admin/src/main/resources/application-druid.yml

@@ -15,7 +15,7 @@ spring:
                 enabled: false
                 url: jdbc:mysql://localhost:3306/industry2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: WANGyu11!
+                password:  root
             # 初始连接数
             initialSize: 5
             # 最小连接池数量

industry-admin/src/main/resources/application.yml

@@ -145,3 +145,5 @@ xss:
 
 ipAddress: 10.20.10.29
 
+httpIp: http://10.20.10.158
+