自测两个端口 异常重检分析完毕

application-facade/src/main/java/com/factory/scheduled/CreateIniBase.java

@@ -51,7 +51,7 @@ public class CreateIniBase {
      */
     @Scheduled(cron = "0 0 0 * * ?")
     public void creat() {
-        List<PagePlanRes> planlist = versionMapper.Planlist(null, null, null);
+        List<PagePlanRes> planlist = versionMapper.Planlist(null, null, null,null);
         Map<Long, List<PagePlanRes>> versionId_res_Map = planlist.stream()
                 //过滤
                 .filter(plan -> {

application-facade/src/main/java/com/factory/web/controller/pad/InitialPlanPadController.java

@@ -5,6 +5,7 @@ import com.factory.base.entity.aggregates.ResponseBean;
 import com.factory.base.entity.vo.req.BaseTypeReq;
 import com.factory.web.entity.vo.req.pad.submitCheckReq;
 import com.factory.web.entity.vo.req.pad.workDetailsReq;
+import com.factory.web.entity.vo.res.pad.ini.abnormalListRes;
 import com.factory.web.entity.vo.res.pad.ini.planlistRes;
 import com.factory.web.entity.vo.res.pad.ini.workDetailsRes;
 import com.factory.web.entity.vo.res.pad.ini.workTypeDetailsRes;
@@ -27,7 +28,7 @@ import java.util.List;
  * @author Dl
  * @date 2021-05-12 09:37:25
  */
-@Api(tags = "本特勒 - 首件")
+@Api(tags = "本特勒 - 首件pad端")
 @RestController
 @RequestMapping("/benteler/pad")
 @Slf4j
@@ -57,19 +58,28 @@ public class InitialPlanPadController {
        return versionService.workTypeDetails(req);
     }
     @ApiOperation(value = "保存点检结果")
-    @PostMapping("/workTypeDetails")
+    @PostMapping("/saveCheckItem")
     @ApiOperationSupport(order = 1)
     public ResponseBean saveCheckItem(@RequestBody workTypeDetailsRes req) {
 
        return versionService.saveCheckItem(req);
     }
     @ApiOperation(value = "提交计划点检结果")
-    @PostMapping("/workTypeDetails")
+    @PostMapping("/submitCheck")
     @ApiOperationSupport(order = 1)
     public ResponseBean submitCheck(@RequestBody submitCheckReq req) {
 
        return versionService.submitCheck(req);
     }
+    @ApiOperation(value = "异常列表")
+    @PostMapping("/abnormalList")
+    @ApiOperationSupport(order = 1)
+    public ResponseBean<abnormalListRes> abnormalList() {
+
+       return versionService.abnormalList();
+    }
+
+
 
 
 

application-facade/src/main/java/com/factory/web/controller/web/initial/InitialPlanWebController.java

@@ -49,7 +49,7 @@ public class InitialPlanWebController {
     @PostMapping("/planlist")
     public ResponseBean<PageBean<PagePlanRes>> planlist(@RequestBody PlanListReq req) {
 
-        return bentelerIniVersionService.planlist_web(req);
+        return bentelerIniVersionService.pagePlan_web(req);
     }
     @ApiOperation(value = "禁用计划")
     @PostMapping("/disablePlan")

application-facade/src/main/java/com/factory/web/entity/vo/res/pad/ini/abnormalListRes.java

@@ -0,0 +1,28 @@
+package com.factory.web.entity.vo.res.pad.ini;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @program: intelligentfactory
+ * @description:
+ * @author: dl
+ * @create: 07月02日 17时
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("")
+public class abnormalListRes {
+    @ApiModelProperty(value = "名称")
+    private String name;
+    @ApiModelProperty(value = "versionid")
+    private Long versionId;
+}

application-facade/src/main/java/com/factory/web/mapper/ini/BentelerIniVersionMapper.java

@@ -13,6 +13,7 @@ import com.factory.web.entity.vo.res.pad.ini.getNowCheckStatusRes;
 import com.factory.web.entity.vo.res.web.ini.PagePlanRes;
 import com.factory.web.entity.vo.res.web.ini.getCheckResutGreadRes;
 import com.factory.web.entity.vo.res.web.ini.unAuditListRes;
+import com.sun.deploy.util.VersionID;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -36,7 +37,8 @@ public interface BentelerIniVersionMapper extends BaseMapper<BentelerIniVersion>
 
     List<PagePlanRes> Planlist(@Param("page") Page<PagePlanRes> page,
                                @Param("name") String name,
-                               @Param("CheckStatus") Integer checkStatus);
+                               @Param("checkStatus") Integer checkStatus,
+                               @Param("VersionId") Long VersionId);
 
     Page<unAuditListRes> unAuditList(@Param("req") PlanListReq req);
 

application-facade/src/main/java/com/factory/web/service/impl/ini/BentelerIniVersionServiceImpl.java

@@ -32,10 +32,7 @@ import com.factory.web.entity.vo.req.pad.GetVersionCheckItemReq;
 import com.factory.web.entity.vo.req.pad.submitCheckReq;
 import com.factory.web.entity.vo.req.pad.workDetailsReq;
 import com.factory.web.entity.vo.req.web.*;
-import com.factory.web.entity.vo.res.pad.ini.getNowCheckStatusRes;
-import com.factory.web.entity.vo.res.pad.ini.planlistRes;
-import com.factory.web.entity.vo.res.pad.ini.workDetailsRes;
-import com.factory.web.entity.vo.res.pad.ini.workTypeDetailsRes;
+import com.factory.web.entity.vo.res.pad.ini.*;
 import com.factory.web.entity.vo.res.web.ini.*;
 import com.factory.web.mapper.ini.BentelerIniVersionMapper;
 import com.factory.web.service.BentelerPlanService;
@@ -80,7 +77,7 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
     private BentelerIniCheckTypeService checkTypeService;
 
     @Override
-    public ResponseBean<PageBean<PagePlanRes>> planlist_web(PlanListReq req) {
+    public ResponseBean<PageBean<PagePlanRes>> pagePlan_web(PlanListReq req) {
         String name = req.getName();
         Integer checkStatus = req.getCheckStatus();
         Page<PagePlanRes> page = new Page<>(req.getPage(), req.getSize());
@@ -102,6 +99,7 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
                 .build();
         planService.save(plan);
         //新增版本
+        /*点检类型*/
         ArrayList<Integer> allCheckType = req.getVersionWorks().stream().collect(
                 ArrayList::new,
                 (theList, item) -> {
@@ -120,6 +118,7 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
                 ArrayList::addAll
 
         );
+        /*基础信息*/
         Map<String, String> baseMap = new HashMap<String, String>() {{
             put("project", req.getName());
             put("part", req.getName());
@@ -135,6 +134,7 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
         if (principalIds.size() > 1) {
             principleTwo = principalIds.get(1);
         }
+        //新增版本
         BentelerIniVersion version = BentelerIniVersion.builder()
                 .planId(plan.getId())
                 .allChecktype(Convert.toStr(allCheckType))
@@ -160,17 +160,19 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
         ArrayList<BentelerIniVersionItem> VersionItems = new ArrayList<>();
 
         req.getVersionWorks().forEach(versionWork -> {
+            //新增工作站
             BentelerIniWorkstation workstation = BentelerIniWorkstation.builder()
                     .workstation(versionWork.getWorkstation())
                     .productionLine(versionWork.getProductionLine())
                     .versionId(version.getId())
                     .build();
             workstationService.save(workstation);
-            //新增工作站
+            //新增点检项
             versionWork.getBentelerIniVersionItems().forEach(item -> {
                 BentelerIniVersionItem versionItem = BentelerIniVersionItem.builder()
                         .planId(plan.getId())
                         .versionId(version.getId())
+                        .workstationId(workstation.getId())
                         .checkStandardTop(item.getCheckStandardTop())
                         .checkStandardFloor(item.getCheckStandardFloor())
                         .checkType(Convert.toStr(item.getCheckType()))
@@ -353,23 +355,29 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
     public ResponseBean<List<workDetailsRes>> workDetails(BaseTypeReq req) {
         Long versionId = req.getId();
         Integer type = req.getType();
+        //req
         GetVersionCheckItemReq getVersionCheckItemReq = GetVersionCheckItemReq.builder()
                 .versionId(versionId)
                 .checkType(type)
                 .localDate(LocalDate.now())
                 .build();
+        //点检项 结果
         List<BentelerIniCheckItem> checkItems = versionMapper.getVersion_CheckItem(getVersionCheckItemReq);
-        Map<Long, List<BentelerIniCheckItem>> versionItemId_checkItem_map =
-                checkItems.stream().collect(Collectors.groupingBy(BentelerIniCheckItem::getId));
+        Map<Long, List<BentelerIniCheckItem>> workId_checkItem_map =
+                checkItems.stream().collect(Collectors.groupingBy(BentelerIniCheckItem::getWorkId));
 
         List<workDetailsRes> resList = new ArrayList<>();
 
-        versionItemId_checkItem_map.entrySet().forEach(item -> {
+        workId_checkItem_map.entrySet().forEach(item -> {
             BentelerIniWorkstation workstation = workstationService.getById(item.getKey());
-            Integer status = workstation.getStatus();
+
+            boolean saveOrSubmit = item.getValue().stream().allMatch(checkitem -> {
+                return !checkitem.getSubmitType().equals(CheckTypeSubmit.未保存.value);
+            });
+
             workDetailsRes res = workDetailsRes.builder()
                     .workName(workstation.getWorkstation() + "-" + workstation.getProductionLine())
-                    .submitType(status)
+                    .submitType(saveOrSubmit==true?1:2)
                     .build();
             resList.add(res);
         });
@@ -449,6 +457,7 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
         checkResultService.updateById(result);
         //点检分类记录表
         BentelerIniCheckType iniCheckType = getResult_checkType(resultId, checkType, LocalDate.now());
+
         //记录提交信息
         iniCheckType.setStatus(CheckTypeSubmit.提交.value);
         iniCheckType.setSubmitUser(commonService.getLoginUserInfo().getId());
@@ -461,12 +470,15 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
                 .like(BentelerIniCheckItem::getCreatedTime, LocalDate.now())
         );
         checkItems.forEach(item -> {
+            item.setSubmitType(CheckTypeSubmit.提交.value);
+
             BentelerIniVersionItem versionItem = versionItemService.getById(item.getVersionItemId());
 
             List<IniGread> iniGreads = item.getIniGreads();
             boolean allPass = iniGreads.stream().allMatch(gread -> {
                 if (gread.isGreadFlag()) {
-                    return versionItem.getCheckStandardTop().compareTo(gread.getGread()) > -1 &&
+                    return versionItem.getCheckStandardTop().compareTo(gread.getGread()) > -1
+                            &&
                             versionItem.getCheckStandardFloor().compareTo(gread.getGread()) < 1;
                 } else {
                     return gread.isPassResult();
@@ -478,6 +490,7 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
         });
         //todo
         //todo
+        checkItemService.saveBatch(checkItems);
         return ResponseBeanBuilder.ok();
     }
 
@@ -767,4 +780,10 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
         List<getCheckResutGreadRes> version_checkResutGread = versionMapper.getVersion_CheckResutGread(versionId, localDate);
         return version_checkResutGread;
     }
+
+    @Override
+    public ResponseBean<abnormalListRes> abnormalList() {
+
+        return null;
+    }
 }

application-facade/src/main/java/com/factory/web/service/ini/BentelerIniVersionService.java

@@ -12,6 +12,7 @@ import com.factory.user.entity.vo.res.FileRes;
 import com.factory.web.entity.vo.req.pad.submitCheckReq;
 import com.factory.web.entity.vo.req.pad.workDetailsReq;
 import com.factory.web.entity.vo.req.web.*;
+import com.factory.web.entity.vo.res.pad.ini.abnormalListRes;
 import com.factory.web.entity.vo.res.pad.ini.planlistRes;
 import com.factory.web.entity.vo.res.pad.ini.workDetailsRes;
 import com.factory.web.entity.vo.res.pad.ini.workTypeDetailsRes;
@@ -29,7 +30,7 @@ import java.util.List;
  */
 public interface BentelerIniVersionService extends IService<BentelerIniVersion> {
 
-    ResponseBean<PageBean<PagePlanRes>> planlist_web(PlanListReq req);
+    ResponseBean<PageBean<PagePlanRes>> pagePlan_web(PlanListReq req);
 
     ResponseBean addIniPlan(AddIniPlanReq req);
 
@@ -74,5 +75,7 @@ public interface BentelerIniVersionService extends IService<BentelerIniVersion>
     ResponseBean<FileRes> exportInitialPlan(exportInitialPlanReq req);
 
     List<getCheckResutGreadRes> getCheckResutGread(getCheckResutGreadReq req);
+
+    ResponseBean<abnormalListRes> abnormalList();
 }
 

application-facade/src/main/resources/mapper/BentelerIniVersionMapper.xml

@@ -75,6 +75,9 @@
             <if test="checkStatus!=null">
                 and biv.check_status = #{checkStatus}
             </if>
+            <if test="VersionId!=null">
+                and biv.id = #{VersionId}
+            </if>
         </where>
         order by bp.created_time desc
 
@@ -169,7 +172,7 @@
         </where>
     </select>
     <select id="getVersion_CheckItem" resultType="com.factory.base.entity.po.benteler.BentelerIniCheckItem">
-        select bici.*
+        select bici.*,biw.id workId
         from benteler_ini_version as biv
         left join benteler_ini_workstation biw on biv.id = biw.version_id
         left join benteler_ini_version_item bivi on biw.id = bivi.workstation_id

application-facade/src/test/java/com/factory/service/impl/BentelerIniVersionServiceImplTest.java

@@ -2,6 +2,7 @@ package com.factory.service.impl;
 
 
 import com.factory.FacadeApplication;
+import com.factory.scheduled.CreateIniBase;
 import com.factory.web.mapper.ini.BentelerIniVersionMapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,11 +20,12 @@ public class BentelerIniVersionServiceImplTest {
     @Autowired
     private BentelerIniVersionMapper versionMapper;
 
+    @Autowired
+    private CreateIniBase createIniBase;
+
     @Test
     public void executeLongdyCreate() {
-        //BentelerPlan unAuditPlan = versionMapper.getUnAuditPlan(6L);
-        //GetVersionCheckItemReq req = GetVersionCheckItemReq.builder().build();
-        //versionMapper.getVersionCheckItem(req);
+        createIniBase.creat();
 
     }
 

common-base/src/main/java/com/factory/base/entity/po/benteler/BentelerIniCheckItem.java

@@ -33,6 +33,7 @@ public class BentelerIniCheckItem implements Serializable {
     @ApiModelProperty(value = "主键")
     private Long id;
 
+
     @ApiModelProperty(value = "检查项id")
     private Long versionItemId;
 
@@ -77,6 +78,9 @@ public class BentelerIniCheckItem implements Serializable {
     @ApiModelProperty(value = "最近更新时间", hidden = true)
     private LocalDateTime updatedTime;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "workId")
+    private Long workId;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "具体工位得分", hidden = true)