防错-接口

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

@@ -14,7 +14,7 @@ import com.factory.base.util.res.ResponseBeanBuilder;
 import com.factory.web.entity.pm.OnsiteApprovalPlan;
 import com.factory.web.entity.pm.OnsiteCalendar;
 import com.factory.web.entity.pm.OnsiteItem;
-import com.factory.web.entity.pm.OnsiteTitleBlob;
+import com.factory.web.entity.pm.OnsiteTitle;
 import com.factory.web.entity.pm.OnsiteWorkshop;
 import com.factory.web.entity.pm.req.AddItemResultListReq;
 import com.factory.web.entity.pm.req.AddPmPlanReq;
@@ -85,7 +85,7 @@ public class PreventMistakeController {
 		return ResponseBeanBuilder.ok(pmPlanRes);
 	}
 
-	@ApiOperation(value = "禁用防错计划")
+	@ApiOperation(value = "禁用解禁防错计划")
 	@PostMapping("/disablePmPlan")
 	@ApiOperationSupport(order = 5)
 	public ResponseBean disablePmPlan(@RequestBody PmPlanPauseFlagReq req) {
@@ -144,8 +144,9 @@ public class PreventMistakeController {
 	@ApiOperation(value = "通过计划ID取得表头")
 	@ApiOperationSupport(order = 13)
 	@PostMapping("/getTitle")
-	public ResponseBean<OnsiteTitleBlob> getTitle(@RequestBody SearchPmPlanReq req) {
-		return preventMistakeService.getTitle(req);
+	public ResponseBean<OnsiteTitle> getTitle(@RequestBody SearchPmPlanReq req) {
+		OnsiteTitle onsiteTitle = preventMistakeService.getTitle(req);
+		return ResponseBeanBuilder.ok(onsiteTitle);
 	}
 
 	@ApiOperation(value = "通过计划ID取得工作站列表")

application-facade/src/main/java/com/factory/web/entity/pm/OnsiteTitle.java

@@ -0,0 +1,40 @@
+package com.factory.web.entity.pm;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 表头信息
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OnsiteTitle implements Serializable {
+
+	@ApiModelProperty(value = "编号")
+	private String id;
+	
+	@ApiModelProperty(value = "issueDate")
+	private String issueDate;
+
+	@ApiModelProperty(value = "issureLevel")
+	private String issureLevel;
+
+	@ApiModelProperty(value = "department")
+	private String department;
+	
+	@ApiModelProperty(value = "replace")
+	private String replace;
+	
+	@ApiModelProperty(value = "productionLine")
+	private String productionLine;
+}

application-facade/src/main/java/com/factory/web/entity/pm/req/AddPmPlanReq.java

@@ -6,6 +6,7 @@ import java.util.List;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Size;
 
+import com.factory.web.entity.pm.OnsiteTitle;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.swagger.annotations.ApiModel;
@@ -40,8 +41,8 @@ public class AddPmPlanReq {
 	@ApiModelProperty(value = "日周月点检规则")
 	private List<OnsiteCalendarReq> onsiteCalendarList;
 
-	@ApiModelProperty(value = "表头")
-	private String titleContent; // TODO 确认一下前端如何传递表头信息，是String还是file文件
+	@ApiModelProperty(value = "表头信息")
+	private OnsiteTitle onsiteTitle;
 
 	@ApiModelProperty(value = "工作站及巡检内容")
 	private List<OnsiteWorkshopReq> onsiteWorkshopList;

application-facade/src/main/java/com/factory/web/entity/pm/req/EditPmPlanReq.java

@@ -6,6 +6,7 @@ import java.util.List;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Size;
 
+import com.factory.web.entity.pm.OnsiteTitle;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.swagger.annotations.ApiModel;
@@ -43,8 +44,8 @@ public class EditPmPlanReq {
 	@ApiModelProperty(value = "日周月点检规则")
 	private List<OnsiteCalendarReq> onsiteCalendarList;
 
-	@ApiModelProperty(value = "表头")
-	private String titleContent; // TODO 确认一下前端如何传递表头信息，是String还是file文件
+	@ApiModelProperty(value = "表头信息")
+	private OnsiteTitle onsiteTitle;
 
 	@ApiModelProperty(value = "工作站及巡检内容")
 	private List<OnsiteWorkshopReq> onsiteWorkshopList;

application-facade/src/main/java/com/factory/web/entity/pm/req/SearchPmItemResultListReq.java

@@ -23,6 +23,9 @@ import lombok.NoArgsConstructor;
 @ApiModel("")
 public class SearchPmItemResultListReq {
 	
+	@ApiModelProperty(value = "计划Id")
+	private Long bentelerPlanId;
+	
 	@ApiModelProperty(value = "点检频次")
 	private Integer typeFlag;
 	

application-facade/src/main/java/com/factory/web/entity/pm/req/SearchPmPlanCheckListReq.java

@@ -28,6 +28,6 @@ public class SearchPmPlanCheckListReq extends BasePageReq {
 	private String bentelerPlanName;
 	
 	@ApiModelProperty(value = "计划状态 0未完成 1已完成 2待重检")
-	private String planStatus;
+	private Integer planStatus;
 	
 }

application-facade/src/main/java/com/factory/web/entity/pm/req/SearchPmPlanListReq.java

@@ -28,6 +28,6 @@ public class SearchPmPlanListReq extends BasePageReq {
 	private String bentelerPlanName;
 	
 	@ApiModelProperty(value = "计划状态 0待质量经理审批、1待生产经理审批、2已驳回待修改、3审批通过")
-	private String planStatus;
+	private Integer planStatus;
 	
 }

application-facade/src/main/java/com/factory/web/entity/pm/req/SearchWorkshopReq.java

@@ -24,6 +24,6 @@ import lombok.NoArgsConstructor;
 public class SearchWorkshopReq {
 	
 	@ApiModelProperty(value = "工作站Id")
-	private String workshopId;
+	private Long workshopId;
 	
 }

application-facade/src/main/java/com/factory/web/entity/pm/res/PmPlanRes.java

@@ -5,6 +5,7 @@ import java.time.LocalDate;
 import java.util.List;
 
 import com.factory.web.entity.pm.OnsiteCalendar;
+import com.factory.web.entity.pm.OnsiteTitle;
 import com.factory.web.entity.pm.OnsiteWorkshop;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
@@ -44,8 +45,8 @@ public class PmPlanRes implements Serializable {
 	@ApiModelProperty(value = "日周月点检规则")
 	private List<OnsiteCalendar> onsiteCalendarList;
 
-	@ApiModelProperty(value = "表头")
-	private String titleContent;
+	@ApiModelProperty(value = "表头信息")
+	private OnsiteTitle onsiteTitle;
 
 	@ApiModelProperty(value = "工作站及巡检内容")
 	private List<OnsiteWorkshop> onsiteWorkshopList;

application-facade/src/main/java/com/factory/web/service/impl/pm/PreventMistakeServiceImpl.java

@@ -4,7 +4,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
@@ -31,6 +30,7 @@ import com.factory.web.entity.pm.OnsiteItemResult;
 import com.factory.web.entity.pm.OnsitePlanHisBlob;
 import com.factory.web.entity.pm.OnsiteTask;
 import com.factory.web.entity.pm.OnsiteTaskHisBlob;
+import com.factory.web.entity.pm.OnsiteTitle;
 import com.factory.web.entity.pm.OnsiteTitleBlob;
 import com.factory.web.entity.pm.OnsiteWorkshop;
 import com.factory.web.entity.pm.req.AddItemResultListReq;
@@ -164,12 +164,16 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		}
 
 		/* 添加表头信息 */
-		// TODO 确认表头传过来的数据类型
-		OnsiteTitleBlob onsiteTitleBlob = OnsiteTitleBlob.builder()
-				.bentelerPlanId(plan.getId())
-				.titleContent(req.getTitleContent().getBytes(StandardCharsets.UTF_8))
-				.build();
-		onsiteTitleBlobService.save(onsiteTitleBlob);
+		try {
+			OnsiteTitleBlob onsiteTitleBlob = OnsiteTitleBlob.builder()
+					.bentelerPlanId(plan.getId())
+					.titleContent(this.objectToByteArray(req.getOnsiteTitle()))
+					.build();
+			onsiteTitleBlobService.save(onsiteTitleBlob);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 
 		/* 添加工作站信息 */
 		List<OnsiteWorkshopReq> onsiteWorkshopList = req.getOnsiteWorkshopList();
@@ -333,10 +337,15 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
                 .eq(OnsiteCalendar::getBentelerPlanId, plan.getId()));
 		pmPlanRes.setOnsiteCalendarList(onsiteCalendarList);
 		
-		OnsiteTitleBlob onsiteTitleBlob = onsiteTitleBlobService.getOne(new LambdaQueryWrapper<OnsiteTitleBlob>()
-    			.eq(OnsiteTitleBlob::getBentelerPlanId, req.getBentelerPlanId()));
-		pmPlanRes.setTitleContent(new String(onsiteTitleBlob.getTitleContent(),StandardCharsets.UTF_8));
-		
+		try {
+			OnsiteTitleBlob onsiteTitleBlob = onsiteTitleBlobService.getOne(new LambdaQueryWrapper<OnsiteTitleBlob>()
+	    			.eq(OnsiteTitleBlob::getBentelerPlanId, req.getBentelerPlanId()));
+			pmPlanRes.setOnsiteTitle((OnsiteTitle)this.byteArrayToObject(onsiteTitleBlob.getTitleContent()));
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
 		List<OnsiteWorkshop> onsiteWorkshopList = onsiteWorkshopService.list(Wrappers.<OnsiteWorkshop>lambdaQuery()
                 .eq(OnsiteWorkshop::getBentelerPlanId, plan.getId()));
 		for (OnsiteWorkshop onsiteWorkshop : onsiteWorkshopList) {
@@ -417,7 +426,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 //			}
 //		}
 
-		/* 修改放错计划 */
+		/* 修改防错计划 */
 		// TODO 计划生效日期
 		BentelerPlan plan = BentelerPlan.builder()
 				.id(req.getBentelerPlanId())
@@ -426,7 +435,6 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		planService.updateById(plan);
 
 		/* 修改日周月点检规则 */
-		// TODO 确认这个删除好用不
 		/* 删除日周月点检规则 */
 		onsiteCalendarService.remove(Wrappers.<OnsiteCalendar>lambdaQuery()
                 .eq(OnsiteCalendar::getBentelerPlanId, plan.getId()));
@@ -449,11 +457,15 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		}
 
 		/* 修改表头信息 */
-		// TODO 确认表头传过来的数据类型
-		LambdaUpdateWrapper<OnsiteTitleBlob> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-        lambdaUpdateWrapper.eq(OnsiteTitleBlob::getBentelerPlanId, plan.getId())
-                           .set(OnsiteTitleBlob::getTitleContent, req.getTitleContent().getBytes(StandardCharsets.UTF_8));
-        onsiteTitleBlobService.update(lambdaUpdateWrapper);
+		try {
+			LambdaUpdateWrapper<OnsiteTitleBlob> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+	        lambdaUpdateWrapper.eq(OnsiteTitleBlob::getBentelerPlanId, plan.getId())
+	                           .set(OnsiteTitleBlob::getTitleContent, this.objectToByteArray(req.getOnsiteTitle()));
+	        onsiteTitleBlobService.update(lambdaUpdateWrapper);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 
         /* 修改工作站、巡检项目 */
         /* 删除巡检项目 */
@@ -565,10 +577,17 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
      * @return 表头信息
      */
     @Override
-    public ResponseBean<OnsiteTitleBlob> getTitle(SearchPmPlanReq req) {
+    public OnsiteTitle getTitle(SearchPmPlanReq req) {
     	OnsiteTitleBlob onsiteTitleBlob = onsiteTitleBlobService.getOne(new LambdaQueryWrapper<OnsiteTitleBlob>()
     			.eq(OnsiteTitleBlob::getBentelerPlanId, req.getBentelerPlanId()));
-		return ResponseBeanBuilder.ok(onsiteTitleBlob);
+    	OnsiteTitle onsiteTitle = new OnsiteTitle();
+		try {
+			onsiteTitle = (OnsiteTitle)this.byteArrayToObject(onsiteTitleBlob.getTitleContent());
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return onsiteTitle;
     }
     
     /**

application-facade/src/main/java/com/factory/web/service/pm/PreventMistakeService.java

@@ -9,7 +9,7 @@ import com.factory.base.entity.po.benteler.BentelerPlan;
 import com.factory.web.entity.pm.OnsiteApprovalPlan;
 import com.factory.web.entity.pm.OnsiteCalendar;
 import com.factory.web.entity.pm.OnsiteItem;
-import com.factory.web.entity.pm.OnsiteTitleBlob;
+import com.factory.web.entity.pm.OnsiteTitle;
 import com.factory.web.entity.pm.OnsiteWorkshop;
 import com.factory.web.entity.pm.req.AddItemResultListReq;
 import com.factory.web.entity.pm.req.AddPmPlanReq;
@@ -160,7 +160,7 @@ public interface PreventMistakeService extends IService<BentelerPlan> {
 	 * @param req
 	 * @return 表头信息
 	 */
-	public ResponseBean<OnsiteTitleBlob> getTitle(SearchPmPlanReq req);
+	public OnsiteTitle getTitle(SearchPmPlanReq req);
 
 	/**
 	 * 取得工作站列表

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

@@ -9,7 +9,7 @@
         SELECT
 			bp.id AS benteler_plan_id,
 			bp.`name` AS benteler_plan_name,
-			GROUP_CONCAT( uu.username ) AS check_person,
+			GROUP_CONCAT( uu.`name` ) AS check_person,
 			bp.created_time,
 			ps.plan_status
 		FROM
@@ -66,7 +66,7 @@
         SELECT
 			bp.id AS benteler_plan_id,
 			bp.`name` AS benteler_plan_name,
-			GROUP_CONCAT( uu.username ) AS check_person,
+			GROUP_CONCAT( uu.`name` ) AS check_person,
 			bp.created_time,
 			ps.plan_status
 		FROM
@@ -149,13 +149,16 @@
 		AND    oi.workshop_id = ow.id
 		AND    oir.onsite_task_id = ot.id
 		AND    ot.onsite_calendar_id = oc.id
+		AND    ow.benteler_plan_id = #{req.bentelerPlanId}
 		AND    oc.type_flag = #{req.typeFlag}
 		<if test="req.yearMonth != null and req.yearMonth != ''">
 		AND    DATE_FORMAT(oir.created_time,'%Y-%m') = #{req.yearMonth}
 		</if>
+		<!-- 
 		<if test="req.year != null and req.year != ''">
 		AND    DATE_FORMAT(oir.created_time,'%Y') = #{req.year}
 		</if>
+		 -->
         ORDER BY oi.workshop_id, oir.onsite_item_id
     </select>