Merge remote-tracking branch 'origin/master'

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

@@ -12,10 +12,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.factory.base.entity.aggregates.PageBean;
 import com.factory.base.entity.aggregates.ResponseBean;
 import com.factory.base.util.res.ResponseBeanBuilder;
-import com.factory.web.entity.onsite.OnsiteItem;
+import com.factory.web.entity.onsite.OnsiteItem2;
 import com.factory.web.entity.onsite.OnsiteItemReq;
 import com.factory.web.entity.onsite.OnsiteItemRes;
-import com.factory.web.service.onsite.OnsiteItemService;
+import com.factory.web.service.onsite.OnsiteItemService2;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,42 +26,42 @@ import io.swagger.annotations.ApiOperation;
 public class OnsiteItemController {
 
 	@Autowired
-	private OnsiteItemService onsiteItemService;
+	private OnsiteItemService2 onsiteItemService2;
 
 	@ApiOperation(value = "添加巡检项目")
 	@PostMapping("/addOnsiteItem")
 	public ResponseBean addOnsiteItem(@RequestBody OnsiteItemReq req) {
-		OnsiteItem onsiteItem = OnsiteItem.builder()
+		OnsiteItem2 onsiteItem = OnsiteItem2.builder()
 				.workshopId(req.getWorkshopId())
 				.itemContent(req.getItemContent())
 				.typeFlag(req.getTypeFlag())
 				.inspectionFlag(req.getInspectionFlag())
 				.build();
 		//onsiteItemService.save(onsiteItem);
-		return ResponseBeanBuilder.ok(onsiteItemService.save(onsiteItem));
+		return ResponseBeanBuilder.ok(onsiteItemService2.save(onsiteItem));
 	}
 
 	@ApiOperation(value = "取得巡检项目")
 	@PostMapping("/getOnsiteItem")
-	public ResponseBean<OnsiteItem> getOnsiteItem(@RequestBody OnsiteItemReq req) {
-		OnsiteItem onsiteItem = onsiteItemService.getById(req.getId());
+	public ResponseBean<OnsiteItem2> getOnsiteItem(@RequestBody OnsiteItemReq req) {
+		OnsiteItem2 onsiteItem = onsiteItemService2.getById(req.getId());
 		return ResponseBeanBuilder.ok(onsiteItem);
 	}
 	
 	@ApiOperation(value = "修改巡检项目")
 	@PostMapping("/updateOnsiteItem")
 	public ResponseBean updateOnsiteItem(@RequestBody OnsiteItemReq req) {
-		OnsiteItem onsiteItem = OnsiteItem.builder()
+		OnsiteItem2 onsiteItem = OnsiteItem2.builder()
 				.id(req.getId())
 				.itemContent(req.getItemContent())
 				.build();
-		return ResponseBeanBuilder.ok(onsiteItemService.updateById(onsiteItem));
+		return ResponseBeanBuilder.ok(onsiteItemService2.updateById(onsiteItem));
 	}
 	
 	@ApiOperation(value = "取得巡检项目列表")
 	@PostMapping("/getOnsiteItemList")
-	public ResponseBean<PageBean<OnsiteItem>> getOnsiteItemList(@RequestBody OnsiteItemReq req) {
-		QueryWrapper<OnsiteItem> queryWrapper = new QueryWrapper<>();
+	public ResponseBean<PageBean<OnsiteItem2>> getOnsiteItemList(@RequestBody OnsiteItemReq req) {
+		QueryWrapper<OnsiteItem2> queryWrapper = new QueryWrapper<>();
 		queryWrapper.orderByDesc("id");
         if (req.getTypeFlag() != null) {
         	queryWrapper.eq("type_flag", req.getTypeFlag());
@@ -70,8 +70,8 @@ public class OnsiteItemController {
         	queryWrapper.like("item_content", req.getItemContent());
         }
         
-		IPage<OnsiteItem> page = new Page<>(req.getPage(), req.getSize());
-        IPage<OnsiteItem> userInfoPage = onsiteItemService.page(page, queryWrapper);
+		IPage<OnsiteItem2> page = new Page<>(req.getPage(), req.getSize());
+        IPage<OnsiteItem2> userInfoPage = onsiteItemService2.page(page, queryWrapper);
         
         return ResponseBeanBuilder.ok(userInfoPage);
 	}
@@ -80,7 +80,7 @@ public class OnsiteItemController {
 	@PostMapping("/getList")
 	public ResponseBean<PageBean<OnsiteItemRes>> getList(@RequestBody OnsiteItemReq req) {
 		
-		return onsiteItemService.getList(req);
+		return onsiteItemService2.getList(req);
 	}
 	
 	

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

@@ -0,0 +1,52 @@
+package com.factory.controller.web;
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.factory.base.entity.aggregates.PageBean;
+import com.factory.base.entity.aggregates.ResponseBean;
+import com.factory.base.util.res.ResponseBeanBuilder;
+import com.factory.web.entity.pm.PreventMistakePlanListReq;
+import com.factory.web.entity.pm.PreventMistakePlanListRes;
+import com.factory.web.entity.vo.req.web.AddIniPlanReq;
+import com.factory.web.service.pm.PreventMistakeService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiOperationSupport;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 防错计划
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Api(tags = "WEB - 防错")
+@RestController
+@RequestMapping("/benteler/web/pm")
+@Slf4j
+public class PreventMistakeController {
+    @Autowired
+    private PreventMistakeService preventMistakeService;
+    
+    
+//    @ApiOperation(value = "新建防错计划")
+//    @PostMapping("/addIniPlan")
+//    @ApiOperationSupport(order = 1)
+//    public ResponseBean addIniPlan(@RequestBody AddIniPlanReq req) {
+//        return ResponseBeanBuilder.ok(bentelerIniVersionService.addIniPlan(req));
+//    }
+
+    @ApiOperation(value = "防错计划列表")
+    @ApiOperationSupport(order = 2)
+    @PostMapping("/pmPlanlist")
+    public ResponseBean<PageBean<PreventMistakePlanListRes>> planlist(@RequestBody PreventMistakePlanListReq req) {
+        return preventMistakeService.getPreventMistakePlanList(req);
+    }
+    
+}

application-facade/src/main/java/com/factory/web/entity/onsite/OnsiteItem2.java

@@ -0,0 +1,41 @@
+package com.factory.web.entity.onsite;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 巡检项目设置
+ *
+ * @author wzy
+ * @date 2021-07-06 12:10:10
+ */
+@Data
+@TableName("onsite_item")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OnsiteItem2 {
+
+	@TableId(type = IdType.AUTO)
+	@ApiModelProperty(value = "巡检项目id")
+	private Long id;
+
+	@ApiModelProperty(value = "关联在工作站id")
+	private Long workshopId;
+
+	@ApiModelProperty(value = "巡检项目内容设置")
+	private String itemContent;
+
+	@ApiModelProperty(value = "0日巡检  1周巡检  2月巡检")
+	private Integer typeFlag;
+
+	@ApiModelProperty(value = "0非手动 1手动")
+	private Integer inspectionFlag;
+}

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

@@ -0,0 +1,60 @@
+package com.factory.web.entity.pm;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+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
+@TableName("onsite_calendar")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OnsiteCalendar {
+
+	@TableId(type = IdType.AUTO)
+	@ApiModelProperty(value = "规则id")
+	private Long id;
+
+	@ApiModelProperty(value = "计划id")
+	private Long bentelerPlanId;
+
+	@ApiModelProperty(value = "日巡检开始时间 格式11:00")
+	private String startDay;
+
+	@ApiModelProperty(value = "日巡检结束时间 格式11:00")
+	private String endDay;
+
+	@ApiModelProperty(value = "日检查时长设置单位分钟 例如60")
+	private Integer dayValidate;
+	
+	@ApiModelProperty(value = "升级时长设置单位是分钟 例如60 这个时间其实是汇报超时给监督")
+	private Integer dayOuttime;
+	
+	@ApiModelProperty(value = "周巡检时间设置  1-7")
+	private Integer weekDay;
+	
+	@ApiModelProperty(value = "月巡检时间 1-28")
+	private Integer monthDay;
+	
+	@ApiModelProperty(value = "月巡检备用预留字段")
+	private Integer month;
+	
+	@ApiModelProperty(value = "点检人对应的用户ID")
+	private Long userId;
+	
+	@ApiModelProperty(value = "0日巡检  1周巡检  2月巡检")
+	private Integer typeFlag;
+
+}

application-facade/src/main/java/com/factory/web/entity/onsite/OnsiteItem.java → application-facade/src/main/java/com/factory/web/entity/pm/OnsiteItem.java

@@ -1,4 +1,4 @@
-package com.factory.web.entity.onsite;
+package com.factory.web.entity.pm;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
  * 巡检项目设置
  *
  * @author wzy
- * @date 2021-07-06 12:10:10
+ * @date 2021-07-09 12:00:00
  */
 @Data
 @TableName("onsite_item")
@@ -27,7 +27,7 @@ public class OnsiteItem {
 	@ApiModelProperty(value = "巡检项目id")
 	private Long id;
 
-	@ApiModelProperty(value = "关联在工作站id")
+	@ApiModelProperty(value = "工作站id")
 	private Long workshopId;
 
 	@ApiModelProperty(value = "巡检项目内容设置")

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

@@ -0,0 +1,39 @@
+package com.factory.web.entity.pm;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+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
+@TableName("onsite_title_blob")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OnsiteTitleBlob {
+
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "巡检项目id")
+    private Long id;
+
+    @ApiModelProperty(value = "计划id")
+    private Long bentelerPlanId;
+
+    @ApiModelProperty(value = "表头")
+    private byte[] titleContent;
+    
+    @TableField(exist = false)
+    private String titleContentStr;
+}

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

@@ -0,0 +1,35 @@
+package com.factory.web.entity.pm;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+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
+@TableName("onsite_workshop")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OnsiteWorkshop {
+
+	@TableId(type = IdType.AUTO)
+	@ApiModelProperty(value = "工作站id")
+	private Long id;
+
+	@ApiModelProperty(value = "计划id")
+	private Long bentelerPlanId;
+
+	@ApiModelProperty(value = "工作站名称")
+	private String wsName;
+}

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

@@ -0,0 +1,33 @@
+package com.factory.web.entity.pm;
+
+import com.factory.base.entity.vo.req.BasePageReq;
+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;
+
+/**
+ * 防错计划
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("")
+public class PreventMistakePlanListReq extends BasePageReq {
+	
+	@ApiModelProperty(value = "计划名称")
+	private String bentelerPlanName;
+	
+	@ApiModelProperty(value = "计划状态")
+	private String planStatus;
+	
+}

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

@@ -0,0 +1,41 @@
+package com.factory.web.entity.pm;
+
+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;
+
+/**
+ * 防错计划
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("")
+public class PreventMistakePlanListRes {
+
+	@ApiModelProperty(value = "计划ID")
+	private Long bentelerPlanId;
+
+	@ApiModelProperty(value = "计划名称")
+	private String bentelerPlanName;
+
+	@ApiModelProperty(value = "检验负责人")
+	private String checkPerson;
+
+	@ApiModelProperty(value = "计划状态")
+	private String planStatus;
+
+	@ApiModelProperty(value = "计划创建日期")
+	private Long createdTime;
+
+}

application-facade/src/main/java/com/factory/web/mapper/onsite/OnsiteItemMapper.java → application-facade/src/main/java/com/factory/web/mapper/onsite/OnsiteItemMapper2.java

@@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.factory.web.entity.onsite.OnsiteItem;
+import com.factory.web.entity.onsite.OnsiteItem2;
 import com.factory.web.entity.onsite.OnsiteItemReq;
 import com.factory.web.entity.onsite.OnsiteItemRes;
 
@@ -16,7 +16,7 @@ import com.factory.web.entity.onsite.OnsiteItemRes;
  * @date 2021-07-06 12:10:10
  */
 @Mapper
-public interface OnsiteItemMapper extends BaseMapper<OnsiteItem> {
+public interface OnsiteItemMapper2 extends BaseMapper<OnsiteItem2> {
 
 	/**
      * 取得巡检项目列表

application-facade/src/main/java/com/factory/web/mapper/pm/OnsiteCalendarMapper.java

@@ -0,0 +1,17 @@
+package com.factory.web.mapper.pm;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.factory.web.entity.pm.OnsiteCalendar;
+
+/**
+ * 日周月规则设置
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Mapper
+public interface OnsiteCalendarMapper extends BaseMapper<OnsiteCalendar> {
+
+}

application-facade/src/main/java/com/factory/web/mapper/pm/OnsiteItemMapper.java

@@ -0,0 +1,18 @@
+package com.factory.web.mapper.pm;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.factory.web.entity.pm.OnsiteItem;
+
+
+/**
+ * 巡检项目设置
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Mapper
+public interface OnsiteItemMapper extends BaseMapper<OnsiteItem> {
+
+}

application-facade/src/main/java/com/factory/web/mapper/pm/OnsiteTitleBlobMapper.java

@@ -0,0 +1,17 @@
+package com.factory.web.mapper.pm;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.factory.web.entity.pm.OnsiteTitleBlob;
+
+/**
+ * 表头信息
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Mapper
+public interface OnsiteTitleBlobMapper extends BaseMapper<OnsiteTitleBlob> {
+
+}

application-facade/src/main/java/com/factory/web/mapper/pm/OnsiteWorkshopMapper.java

@@ -0,0 +1,17 @@
+package com.factory.web.mapper.pm;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.factory.web.entity.pm.OnsiteWorkshop;
+
+/**
+ * 工作站
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Mapper
+public interface OnsiteWorkshopMapper extends BaseMapper<OnsiteWorkshop> {
+
+}

application-facade/src/main/java/com/factory/web/mapper/pm/PreventMistakeMapper.java

@@ -0,0 +1,28 @@
+package com.factory.web.mapper.pm;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.factory.base.entity.po.benteler.BentelerPlan;
+import com.factory.web.entity.pm.PreventMistakePlanListReq;
+import com.factory.web.entity.pm.PreventMistakePlanListRes;
+
+/**
+ * 防错计划
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Mapper
+public interface PreventMistakeMapper extends BaseMapper<BentelerPlan> {
+
+	/**
+     * 取得防错计划列表
+     * @param page
+     * @param req
+     * @return 防错计划列表
+     */
+    public Page<PreventMistakePlanListRes> getPreventMistakePlanList(@Param("page") Page page, @Param("req") PreventMistakePlanListReq req);
+}

application-facade/src/main/java/com/factory/web/service/impl/onsite/OnsiteItemServiceImpl.java → application-facade/src/main/java/com/factory/web/service/impl/onsite/OnsiteItemService2Impl.java

@@ -1,7 +1,5 @@
 package com.factory.web.service.impl.onsite;
 
-import java.util.List;
-import java.util.Map;
 import java.util.function.Function;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,13 +11,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.factory.base.entity.aggregates.PageBean;
 import com.factory.base.entity.aggregates.ResponseBean;
 import com.factory.base.util.res.ResponseBeanBuilder;
-import com.factory.web.entity.onsite.OnsiteItem;
-import com.factory.web.entity.onsite.OnsiteItemRes;
+import com.factory.web.entity.onsite.OnsiteItem2;
 import com.factory.web.entity.onsite.OnsiteItemReq;
-import com.factory.web.entity.vo.res.web.ini.unAuditListRes;
-import com.factory.web.mapper.ini.BentelerIniVersionMapper;
-import com.factory.web.mapper.onsite.OnsiteItemMapper;
-import com.factory.web.service.onsite.OnsiteItemService;
+import com.factory.web.entity.onsite.OnsiteItemRes;
+import com.factory.web.mapper.onsite.OnsiteItemMapper2;
+import com.factory.web.service.onsite.OnsiteItemService2;
 
 /**
  * 巡检项目设置
@@ -27,12 +23,12 @@ import com.factory.web.service.onsite.OnsiteItemService;
  * @author wzy
  * @date 2021-07-06 12:10:10
  */
-@Service("onsiteItemService")
+@Service("onsiteItemService2")
 @Transactional(rollbackFor = Exception.class)
-public class OnsiteItemServiceImpl extends ServiceImpl<OnsiteItemMapper, OnsiteItem> implements OnsiteItemService {
+public class OnsiteItemService2Impl extends ServiceImpl<OnsiteItemMapper2, OnsiteItem2> implements OnsiteItemService2 {
 
 	@Autowired
-    private OnsiteItemMapper onsiteItemMapper;
+    private OnsiteItemMapper2 onsiteItemMapper2;
 	
 	/**
      * 取得巡检项目列表
@@ -41,7 +37,7 @@ public class OnsiteItemServiceImpl extends ServiceImpl<OnsiteItemMapper, OnsiteI
      */
     public ResponseBean<PageBean<OnsiteItemRes>> getList(OnsiteItemReq req) {
     	Page<OnsiteItemRes> page = new Page<>(req.getPage(), req.getSize());
-        Page<OnsiteItemRes> listResPage = onsiteItemMapper.getList(page, req);
+        Page<OnsiteItemRes> listResPage = onsiteItemMapper2.getList(page, req);
         return ResponseBeanBuilder.ok(listResPage, Function.identity());
     }
 }

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

@@ -0,0 +1,22 @@
+package com.factory.web.service.impl.pm;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.factory.web.entity.pm.OnsiteCalendar;
+import com.factory.web.mapper.pm.OnsiteCalendarMapper;
+import com.factory.web.service.pm.OnsiteCalendarService;
+
+
+/**
+ * 日周月规则设置
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Service("onsiteCalendarService")
+@Transactional(rollbackFor = Exception.class)
+public class OnsiteCalendarServiceImpl extends ServiceImpl<OnsiteCalendarMapper, OnsiteCalendar> implements OnsiteCalendarService {
+
+}

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

@@ -0,0 +1,22 @@
+package com.factory.web.service.impl.pm;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.factory.web.entity.pm.OnsiteItem;
+import com.factory.web.mapper.pm.OnsiteItemMapper;
+import com.factory.web.service.pm.OnsiteItemService;
+
+
+/**
+ * 巡检项目设置
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Service("onsiteItemService")
+@Transactional(rollbackFor = Exception.class)
+public class OnsiteItemServiceImpl extends ServiceImpl<OnsiteItemMapper, OnsiteItem> implements OnsiteItemService {
+
+}

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

@@ -0,0 +1,22 @@
+package com.factory.web.service.impl.pm;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.factory.web.entity.pm.OnsiteTitleBlob;
+import com.factory.web.mapper.pm.OnsiteTitleBlobMapper;
+import com.factory.web.service.pm.OnsiteTitleBlobService;
+
+
+/**
+ * 表头信息
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Service("onsiteTitleBlobService")
+@Transactional(rollbackFor = Exception.class)
+public class OnsiteTitleBlobServiceImpl extends ServiceImpl<OnsiteTitleBlobMapper, OnsiteTitleBlob> implements OnsiteTitleBlobService {
+
+}

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

@@ -0,0 +1,22 @@
+package com.factory.web.service.impl.pm;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.factory.web.entity.pm.OnsiteWorkshop;
+import com.factory.web.mapper.pm.OnsiteWorkshopMapper;
+import com.factory.web.service.pm.OnsiteWorkshopService;
+
+
+/**
+ * 工作站
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Service("onsiteWorkshopService")
+@Transactional(rollbackFor = Exception.class)
+public class OnsiteWorkshopServiceImpl extends ServiceImpl<OnsiteWorkshopMapper, OnsiteWorkshop> implements OnsiteWorkshopService {
+
+}

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

@@ -0,0 +1,68 @@
+package com.factory.web.service.impl.pm;
+
+import java.util.List;
+import java.util.function.Function;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.factory.base.entity.aggregates.PageBean;
+import com.factory.base.entity.aggregates.ResponseBean;
+import com.factory.base.entity.po.benteler.BentelerPlan;
+import com.factory.base.util.res.ResponseBeanBuilder;
+import com.factory.web.entity.pm.PreventMistakePlanListReq;
+import com.factory.web.entity.pm.PreventMistakePlanListRes;
+import com.factory.web.mapper.pm.PreventMistakeMapper;
+import com.factory.web.service.BentelerPlanService;
+import com.factory.web.service.pm.PreventMistakeService;
+
+/**
+ * 防错计划
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Service("preventMistakeService")
+@Transactional(rollbackFor = Exception.class)
+public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper, BentelerPlan> implements PreventMistakeService {
+
+	@Autowired
+    private PreventMistakeMapper preventMistakeMapper;
+	
+    @Autowired
+    private BentelerPlanService planService;
+    
+    /**
+     * 计划名称是否重复
+     * @param name
+     * @return 
+     */
+    @Override
+    public boolean planNameRepetition(String name) {
+        List<BentelerPlan> plans = planService.list(Wrappers.<BentelerPlan>lambdaQuery()
+                .eq(BentelerPlan::getName, name));
+        if (CollectionUtils.isNotEmpty(plans)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 取得巡检项目列表
+     * @param req
+     * @return 巡检项目列表
+     */
+    @Override
+    public ResponseBean<PageBean<PreventMistakePlanListRes>> getPreventMistakePlanList(PreventMistakePlanListReq req) {
+    	Page<PreventMistakePlanListRes> page = new Page<>(req.getPage(), req.getSize());
+        Page<PreventMistakePlanListRes> listResPage = preventMistakeMapper.getPreventMistakePlanList(page, req);
+        return ResponseBeanBuilder.ok(listResPage, Function.identity());
+    }
+
+    
+}

application-facade/src/main/java/com/factory/web/service/onsite/OnsiteItemService.java → application-facade/src/main/java/com/factory/web/service/onsite/OnsiteItemService2.java

@@ -3,7 +3,7 @@ package com.factory.web.service.onsite;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.factory.base.entity.aggregates.PageBean;
 import com.factory.base.entity.aggregates.ResponseBean;
-import com.factory.web.entity.onsite.OnsiteItem;
+import com.factory.web.entity.onsite.OnsiteItem2;
 import com.factory.web.entity.onsite.OnsiteItemReq;
 import com.factory.web.entity.onsite.OnsiteItemRes;
 
@@ -13,7 +13,7 @@ import com.factory.web.entity.onsite.OnsiteItemRes;
  * @author wzy
  * @date 2021-07-06 12:10:10
  */
-public interface OnsiteItemService extends IService<OnsiteItem> {
+public interface OnsiteItemService2 extends IService<OnsiteItem2> {
 	
 	/**
      * 取得巡检项目列表

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

@@ -0,0 +1,14 @@
+package com.factory.web.service.pm;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.factory.web.entity.pm.OnsiteCalendar;
+
+/**
+ * 日周月规则设置
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+public interface OnsiteCalendarService extends IService<OnsiteCalendar> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.factory.web.service.pm;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.factory.web.entity.pm.OnsiteItem;
+
+
+/**
+ * 巡检项目设置
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+public interface OnsiteItemService extends IService<OnsiteItem> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.factory.web.service.pm;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.factory.web.entity.pm.OnsiteTitleBlob;
+
+/**
+ * 表头信息
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+public interface OnsiteTitleBlobService extends IService<OnsiteTitleBlob> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.factory.web.service.pm;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.factory.web.entity.pm.OnsiteWorkshop;
+
+/**
+ * 工作站
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+public interface OnsiteWorkshopService extends IService<OnsiteWorkshop> {
+
+}

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

@@ -0,0 +1,32 @@
+package com.factory.web.service.pm;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.factory.base.entity.aggregates.PageBean;
+import com.factory.base.entity.aggregates.ResponseBean;
+import com.factory.base.entity.po.benteler.BentelerPlan;
+import com.factory.web.entity.pm.PreventMistakePlanListReq;
+import com.factory.web.entity.pm.PreventMistakePlanListRes;
+
+/**
+ * 防错计划
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+public interface PreventMistakeService extends IService<BentelerPlan> {
+
+	/**
+     * 计划名称是否重复
+     * @param name
+     * @return 
+     */
+    public boolean planNameRepetition(String name);
+
+    /**
+     * 取得巡检项目列表
+     * @param req
+     * @return 巡检项目列表
+     */
+    public ResponseBean<PageBean<PreventMistakePlanListRes>> getPreventMistakePlanList(PreventMistakePlanListReq req);
+    
+}

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.factory.web.mapper.onsite.OnsiteItemMapper">
+<mapper namespace="com.factory.web.mapper.onsite.OnsiteItemMapper2">
 	
 	
     <!--取得巡检项目列表-->

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.factory.web.mapper.pm.PreventMistakeMapper">
+	
+	
+    <!--取得防错计划列表（TODO 计划状态需要处理）-->
+    <select id="getPreventMistakePlanList" resultType="com.factory.web.entity.pm.PreventMistakePlanListRes">
+        SELECT  bp.id AS benteler_plan_id,
+        		bp.`name` AS benteler_plan_name,
+				GROUP_CONCAT(uu.username) AS check_person,
+				bp.created_time
+		FROM    benteler_plan bp,
+		        onsite_calendar oc,
+				us_user uu
+		WHERE   bp.id = oc.benteler_plan_id
+		AND     oc.user_id = uu.id
+		<if test="req.bentelerPlanName != null and req.bentelerPlanName != ''">
+		AND     bp.`name` LIKE CONCAT('%', #{req.bentelerPlanName}, '%')
+		</if>
+		GROUP BY bp.id
+    </select>
+    
+
+
+</mapper>