巡检工单+异常项目查询

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/controller/CmmsInspectController.java

@@ -191,8 +191,8 @@ public class CmmsInspectController extends JeecgController<CmmsInspect, ICmmsIns
 	@ApiOperation(value="巡检工单-反馈", notes="巡检工单-反馈")
 	//@RequiresPermissions("org.jeecg.modules:cmms_inspect:edit")
 	@RequestMapping(value = "/feedback", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> feedBack(@RequestBody CmmsInspectTcontentItem inspectTcontentItem) {
-		boolean b = inspectTcontentItemService.feedBack(inspectTcontentItem);
+	public Result<String> feedBack(@RequestBody CmmsInspectTcontentItem inspectTcontentItem,HttpServletRequest req) {
+		boolean b = inspectTcontentItemService.feedBack(inspectTcontentItem,req);
 		if (b) {
 			return Result.ok("反馈成功!");
 		}

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/mapper/CmmsInspectPlanMapper.java

@@ -22,7 +22,7 @@ public interface CmmsInspectPlanMapper extends BaseMapper<CmmsInspectPlan> {
     *   des: 更新下次执行时间
     *   date: 2024/1/25
     */
-    public int refreshNextTime(List<CmmsInspectPlan> subPlanList);
+    public int refreshNextTime(@Param("list") List<CmmsInspectPlan> subPlanList);
 
     /**
     *   author: dzc

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/service/ICmmsInspectPlanService.java

@@ -4,6 +4,8 @@ import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlan;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlanVo;
 
+import java.util.List;
+
 /**
  * @Description: 巡检计划
  * @Author: jeecg-boot
@@ -67,4 +69,13 @@ public interface ICmmsInspectPlanService extends IService<CmmsInspectPlan> {
     *   date: 2024/1/25
     */
     boolean generateInspect(String id);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 获取所有的巡检计划
+    *   date: 2024/1/26
+    */
+    List<CmmsInspectPlan> selectAllPlanOnStatus();
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/service/impl/CmmsInspectPlanServiceImpl.java

@@ -377,6 +377,22 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
     /**
     *   author: dzc
     *   version: 1.0
+    *   des: 获取所有的巡检计划
+    *   date: 2024/1/26 
+    */
+    @Override
+    public List<CmmsInspectPlan> selectAllPlanOnStatus() {
+        List<CmmsInspectPlan> list = (List<CmmsInspectPlan>) redisUtil.get(CacheKey.CMMS_INSPECT_PLAN);
+        if (list == null || list.size() == 0){
+            setRedisCache();
+            list = (List<CmmsInspectPlan>) redisUtil.get(CacheKey.CMMS_INSPECT_PLAN);
+        }
+        return list;
+    }
+
+    /**
+    *   author: dzc
+    *   version: 1.0
     *   des: 批量添加 巡检计划 - 任务
     *   date: 2024/1/23
     */

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/controller/CmmsInspectTcontentItemController.java

@@ -13,6 +13,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem;
+import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItemVo;
 import org.jeecg.modules.cmmsInspectTcontentItem.service.ICmmsInspectTcontentItemService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.cmmsRepair.entity.CmmsRepair;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -60,12 +62,13 @@ public class CmmsInspectTcontentItemController extends JeecgController<CmmsInspe
 	 * @return
 	 */
 	//@AutoLog(value = "巡检工单-路线-内容-设备-巡检项-分页列表查询")
-	@ApiOperation(value="巡检工单-路线-内容-设备-巡检项-分页列表查询", notes="巡检工单-路线-内容-设备-巡检项-分页列表查询")
+	@ApiOperation(value="巡检工单-异常项目查询", notes="巡检工单-异常项目查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<CmmsInspectTcontentItem>> queryPageList(CmmsInspectTcontentItem cmmsInspectTcontentItem,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
+		cmmsInspectTcontentItem.setIresult("1");
 		QueryWrapper<CmmsInspectTcontentItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectTcontentItem, req.getParameterMap());
 		Page<CmmsInspectTcontentItem> page = new Page<CmmsInspectTcontentItem>(pageNo, pageSize);
 		IPage<CmmsInspectTcontentItem> pageList = cmmsInspectTcontentItemService.page(page, queryWrapper);
@@ -141,8 +144,9 @@ public class CmmsInspectTcontentItemController extends JeecgController<CmmsInspe
 	//@AutoLog(value = "巡检工单-路线-内容-设备-巡检项-通过id查询")
 	@ApiOperation(value="巡检工单-路线-内容-设备-巡检项-通过id查询", notes="巡检工单-路线-内容-设备-巡检项-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<CmmsInspectTcontentItem> queryById(@RequestParam(name="id",required=true) String id) {
-		CmmsInspectTcontentItem cmmsInspectTcontentItem = cmmsInspectTcontentItemService.getById(id);
+	public Result<CmmsInspectTcontentItemVo> queryById(@RequestParam(name="id",required=true) String id) {
+		//CmmsInspectTcontentItem cmmsInspectTcontentItem = cmmsInspectTcontentItemService.getById(id);
+		CmmsInspectTcontentItemVo cmmsInspectTcontentItem = cmmsInspectTcontentItemService.getByDetailId(id);
 		if(cmmsInspectTcontentItem==null) {
 			return Result.error("未找到对应数据");
 		}
@@ -174,4 +178,37 @@ public class CmmsInspectTcontentItemController extends JeecgController<CmmsInspe
         return super.importExcel(request, response, CmmsInspectTcontentItem.class);
     }
 
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 异常项目查询 确认
+    *   date: 2024/1/26
+    */
+	@AutoLog(value = "巡检工单-异常项目查询-确认")
+	@ApiOperation(value="巡检工单-异常项目查询-确认", notes="巡检工单-异常项目查询-确认")
+	//@RequiresPermissions("org.jeecg.modules:cmms_inspect_tcontent_item:add")
+	@PostMapping(value = "/confirm")
+	public Result<String> confirm(@RequestBody CmmsInspectTcontentItem cmmsInspectTcontentItem,HttpServletRequest req) {
+		boolean b = cmmsInspectTcontentItemService.confirm(cmmsInspectTcontentItem, req);
+		if (b) {
+			return Result.OK("操作成功！");
+		}
+		return Result.error("操作失败！");
+	}
+
+	/**
+	*   author: dzc
+	*   version: 1.0
+	*   des: 异常项目查询 转报修
+	*   date: 2024/1/26
+	*/
+	@AutoLog(value = "巡检工单-异常项目查询-确认")
+	@ApiOperation(value="巡检工单-异常项目查询-确认", notes="巡检工单-异常项目查询-确认")
+	//@RequiresPermissions("org.jeecg.modules:cmms_inspect_tcontent_item:add")
+	@PostMapping(value = "/transrepair")
+	public Result<String> transrepair(@RequestBody CmmsRepair cmmsRepair, HttpServletRequest req) {
+		cmmsInspectTcontentItemService.transrepair(cmmsRepair,req);
+		return Result.OK("添加成功！");
+	}
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/convert/CmmsInspectTcontentItemConvert.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.cmmsInspectTcontentItem.convert;
+
+import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpot;
+import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpotVo;
+import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem;
+import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItemVo;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.util.CollectionUtils;
+
+import java.util.stream.Collectors;
+
+/**
+ * @author dzc
+ * @date 2024/1/24 14:49
+ * @package org.jeecg.modules.cmmsInspectPlan.convert
+ * @project EMS_server
+ * @des
+ */
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
+public interface CmmsInspectTcontentItemConvert {
+
+    CmmsInspectTcontentItemConvert INSTANCE = Mappers.getMapper(CmmsInspectTcontentItemConvert.class);
+
+    CmmsInspectTcontentItemVo convert(CmmsInspectTcontentItem tcontentItem);
+}

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/entity/CmmsInspectTcontentItem.java

@@ -113,9 +113,9 @@ public class CmmsInspectTcontentItem implements Serializable {
     @ApiModelProperty(value = "反馈状态：0未反馈，1已反馈")
     private java.lang.String istatus;
 	/**反馈时间*/
-	@Excel(name = "反馈时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "反馈时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "反馈时间")
     private java.util.Date itime;
 	/**是否有附件：有/无*/
@@ -149,9 +149,9 @@ public class CmmsInspectTcontentItem implements Serializable {
     @ApiModelProperty(value = "转报修人")
     private java.lang.String reportuser;
 	/**转报修时间*/
-	@Excel(name = "转报修时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "转报修时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "转报修时间")
     private java.util.Date reporttime;
 	/**所属部门*/

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/entity/CmmsInspectTcontentItemVo.java

@@ -0,0 +1,30 @@
+package org.jeecg.modules.cmmsInspectTcontentItem.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @author dzc
+ * @date 2024/1/26 10:45
+ * @package org.jeecg.modules.cmmsInspectTcontentItem.entity
+ * @project EMS_server
+ * @des
+ */
+@Data
+public class CmmsInspectTcontentItemVo extends CmmsInspectTcontentItem{
+
+    /**设备编号*/
+    @Excel(name = "设备编号", width = 15)
+    @ApiModelProperty(value = "设备编号")
+    private java.lang.String equipmentcode;
+    /**工单编号*/
+    @Excel(name = "工单编号", width = 15)
+    @ApiModelProperty(value = "工单编号")
+    private java.lang.String inspectcode;
+    /**工单名称*/
+    @Excel(name = "工单名称", width = 15)
+    @ApiModelProperty(value = "工单名称")
+    private java.lang.String inspectname;
+
+}

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/mapper/CmmsInspectTcontentItemMapper.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.cmmsInspectTcontentItem.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cmmsInspect.entity.CmmsInspect;
+import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContent;
 import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -15,4 +17,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface CmmsInspectTcontentItemMapper extends BaseMapper<CmmsInspectTcontentItem> {
 
     List<CmmsInspectTcontentItem> getInspectTcontentItems(String countid);
+
+    CmmsInspectContent getInspectContentById(String contitemtid);
+
+    CmmsInspect getInspectById(String inspectid);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/mapper/xml/CmmsInspectTcontentItemMapper.xml

@@ -7,4 +7,11 @@
         select * from cmms_inspect_tcontent_item where contitemtid = #{countid}
     </select>
 
+    <select id="getInspectContentById" resultType="org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContent">
+        select * from cmms_inspect_content where id = #{contitemtid}
+    </select>
+
+    <select id="getInspectById" resultType="org.jeecg.modules.cmmsInspect.entity.CmmsInspect">
+        select * from cmms_inspect where id = #{inspectid}
+    </select>
 </mapper>

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/service/ICmmsInspectTcontentItemService.java

@@ -2,7 +2,10 @@ package org.jeecg.modules.cmmsInspectTcontentItem.service;
 
 import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItemVo;
+import org.jeecg.modules.cmmsRepair.entity.CmmsRepair;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -28,5 +31,29 @@ public interface ICmmsInspectTcontentItemService extends IService<CmmsInspectTco
     *   des: 巡检工单反馈
     *   date: 2024/1/26
     */
-    boolean feedBack(CmmsInspectTcontentItem inspectTcontentItem);
+    boolean feedBack(CmmsInspectTcontentItem inspectTcontentItem,HttpServletRequest req);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 巡检工单 异常项目查询  查看(根据id查询详情)
+    *   date: 2024/1/26
+    */
+    CmmsInspectTcontentItemVo getByDetailId(String id);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 巡检工单异常项目查询 确认
+    *   date: 2024/1/26
+    */
+    boolean confirm(CmmsInspectTcontentItem cmmsInspectTcontentItem,HttpServletRequest req);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 异常项目查询 转报修
+    *   date: 2024/1/26
+    */
+    boolean transrepair(CmmsRepair cmmsRepair, HttpServletRequest req);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/service/impl/CmmsInspectTcontentItemServiceImpl.java

@@ -1,14 +1,30 @@
 package org.jeecg.modules.cmmsInspectTcontentItem.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.cmmsInspect.entity.CmmsInspect;
+import org.jeecg.modules.cmmsInspect.service.ICmmsInspectService;
+import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContent;
+import org.jeecg.modules.cmmsInspectContent.service.ICmmsInspectContentService;
+import org.jeecg.modules.cmmsInspectTcontentItem.convert.CmmsInspectTcontentItemConvert;
 import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem;
+import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItemVo;
 import org.jeecg.modules.cmmsInspectTcontentItem.mapper.CmmsInspectTcontentItemMapper;
 import org.jeecg.modules.cmmsInspectTcontentItem.service.ICmmsInspectTcontentItemService;
+import org.jeecg.modules.cmmsRepair.entity.CmmsRepair;
+import org.jeecg.modules.cmmsRepair.service.ICmmsRepairService;
+import org.jeecg.modules.tpmEquipment.entity.TpmEquipment;
+import org.jeecg.modules.tpmEquipment.service.ITpmEquipmentService;
+import org.jeecg.modules.util.AutoCodeUtil;
+import org.jeecg.modules.util.UserConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -23,6 +39,16 @@ public class CmmsInspectTcontentItemServiceImpl extends ServiceImpl<CmmsInspectT
     @Autowired
     @SuppressWarnings("all")
     private CmmsInspectTcontentItemMapper mapper;
+    @Autowired
+    @SuppressWarnings("all")
+    private ITpmEquipmentService tpmEquipmentService;
+    @Autowired
+    @SuppressWarnings("all")
+    private AutoCodeUtil autoCodeUtil;
+    @Autowired
+    @SuppressWarnings("all")
+    private ICmmsRepairService repairService;
+
 
     @Override
     public List<CmmsInspectTcontentItem> getInspectTcontentItems(String countid) {
@@ -36,8 +62,60 @@ public class CmmsInspectTcontentItemServiceImpl extends ServiceImpl<CmmsInspectT
     *   date: 2024/1/26
     */
     @Override
-    public boolean feedBack(CmmsInspectTcontentItem inspectTcontentItem) {
+    public boolean feedBack(CmmsInspectTcontentItem inspectTcontentItem, HttpServletRequest req) {
+        String userName = JwtUtil.getUserNameByToken(req);
         inspectTcontentItem.setIstatus("1");
+        inspectTcontentItem.setHandleuser(userName);
+        inspectTcontentItem.setItime(DateUtils.getDate());
         return this.updateById(inspectTcontentItem);
     }
+
+    @Override
+    public CmmsInspectTcontentItemVo getByDetailId(String id) {
+        CmmsInspectTcontentItem item = this.getById(id);
+        CmmsInspectTcontentItemVo tcontentItem = CmmsInspectTcontentItemConvert.INSTANCE.convert(item);
+        // 根据巡检内容id查询出 对应的设备id 在通过设备id查询出设备信息
+        CmmsInspectContent inspectContent = mapper.getInspectContentById(item.getContitemtid());
+        TpmEquipment equipment = tpmEquipmentService.getById(inspectContent.getEquipmentid());
+
+        // 根据巡检工单id查询出巡检工单信息
+        CmmsInspect inspect = mapper.getInspectById(item.getInspectid());
+
+        tcontentItem.setEquipmentcode(equipment.getEquipmentcode());
+        tcontentItem.setInspectcode(inspect.getInspectcode());
+        tcontentItem.setInspectname(inspect.getInspectname());
+        return tcontentItem;
+    }
+
+
+    @Override
+    public boolean confirm(CmmsInspectTcontentItem cmmsInspectTcontentItem,HttpServletRequest req) {
+        String userName = JwtUtil.getUserNameByToken(req);
+        cmmsInspectTcontentItem.setUnusualstatus("1");
+        cmmsInspectTcontentItem.setConfirmuser(userName);
+        cmmsInspectTcontentItem.setConfirmtime(DateUtils.getDate());
+        return this.updateById(cmmsInspectTcontentItem);
+    }
+
+    @Override
+    public boolean transrepair(CmmsRepair cmmsRepair, HttpServletRequest req) {
+        String userName = JwtUtil.getUserNameByToken(req);
+        CmmsInspectTcontentItem inspectTcontentItem = new CmmsInspectTcontentItem();
+        inspectTcontentItem.setUnusualstatus("2");
+        inspectTcontentItem.setReportuser(userName);
+        inspectTcontentItem.setReporttime(DateUtils.getDate());
+
+        if (cmmsRepair.getRepaircode() == null || "".equals(cmmsRepair.getRepaircode())){
+            cmmsRepair.setRepaircode(autoCodeUtil.genSerialCode(UserConstants.CMMSREPAIR_CODE, null));
+        }
+
+        if(ObjectUtil.isEmpty(cmmsRepair.getStatus()) && ObjectUtil.isEmpty(cmmsRepair.getRepairstatus())){
+            cmmsRepair.setStatus("0");
+            cmmsRepair.setRepairstatus("0");
+        }
+
+        boolean b1 = repairService.save(cmmsRepair);
+        boolean b2 = this.updateById(inspectTcontentItem);
+        return b1 && b2;
+    }
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/entity/CmmsRepair.java

@@ -71,6 +71,7 @@ public class CmmsRepair implements Serializable {
 	/**设备ID*/
 	@Excel(name = "设备ID", width = 15)
     @ApiModelProperty(value = "设备ID")
+    @Dict(dictTable = "tpm_equipment", dicText = "equipmentname", dicCode = "id")
     private java.lang.String equipmentid;
 	/**设备编号*/
 	@Excel(name = "设备编号", width = 15)