Merge remote-tracking branch 'origin/master'

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java

@@ -8,6 +8,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.Environment;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -18,6 +19,7 @@ import java.net.UnknownHostException;
 */
 @Slf4j
 @SpringBootApplication
+@EnableScheduling
 //@EnableAutoConfiguration(exclude={MongoAutoConfiguration.class})
 public class JeecgSystemApplication extends SpringBootServletInitializer {
 
@@ -41,4 +43,4 @@ public class JeecgSystemApplication extends SpringBootServletInitializer {
 
     }
 
-}
+}

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -36,42 +36,42 @@ spring:
             enable: true
             required: true
   ## kafka配置
-  kafka:
-      bootstrap-servers: 192.168.2.154:9092,192.168.2.176:9092,192.168.2.114:9092
-      producer:
-        # 发生错误后，消息重发的次数。
-        retries: 0
-        #当有多个消息需要被发送到同一个分区时，生产者会把它们放在同一个批次里。该参数指定了一个批次可以使用的内存大小，按照字节数计算。
-        batch-size: 16384
-        # 设置生产者内存缓冲区的大小。
-        buffer-memory: 33554432
-        # 键的序列化方式
-        key-serializer: org.apache.kafka.common.serialization.StringSerializer
-        # 值的序列化方式
-        value-serializer: org.apache.kafka.common.serialization.StringSerializer
-        # acks=0 ： 生产者在成功写入消息之前不会等待任何来自服务器的响应。
-        # acks=1 ： 只要集群的首领节点收到消息，生产者就会收到一个来自服务器成功响应。
-        # acks=all ：只有当所有参与复制的节点全部收到消息时，生产者才会收到一个来自服务器的成功响应。
-        acks: 0
-      consumer:
-        # 自动提交的时间间隔 在spring boot 2.X 版本中这里采用的是值的类型为Duration 需要符合特定的格式，如1S,1M,2H,5D
-        auto-commit-interval: 1S
-        # 该属性指定了消费者在读取一个没有偏移量的分区或者偏移量无效的情况下该作何处理：
-        # latest（默认值）在偏移量无效的情况下，消费者将从最新的记录开始读取数据（在消费者启动之后生成的记录）
-        # earliest ：在偏移量无效的情况下，消费者将从起始位置读取分区的记录
-        auto-offset-reset: earliest
-        # 是否自动提交偏移量，默认值是true,为了避免出现重复数据和数据丢失，可以把它设置为false,然后手动提交偏移量
-        enable-auto-commit: false
-        # 键的反序列化方式
-        key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
-        # 值的反序列化方式
-        value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
-      listener:
-        # 在侦听器容器中运行的线程数。
-        concurrency: 5
-        #listner负责ack，每调用一次，就立即commit
-        ack-mode: manual_immediate
-        missing-topics-fatal: false
+#  kafka:
+#      bootstrap-servers: 192.168.2.154:9092,192.168.2.176:9092,192.168.2.114:9092
+#      producer:
+#        # 发生错误后，消息重发的次数。
+#        retries: 0
+#        #当有多个消息需要被发送到同一个分区时，生产者会把它们放在同一个批次里。该参数指定了一个批次可以使用的内存大小，按照字节数计算。
+#        batch-size: 16384
+#        # 设置生产者内存缓冲区的大小。
+#        buffer-memory: 33554432
+#        # 键的序列化方式
+#        key-serializer: org.apache.kafka.common.serialization.StringSerializer
+#        # 值的序列化方式
+#        value-serializer: org.apache.kafka.common.serialization.StringSerializer
+#        # acks=0 ： 生产者在成功写入消息之前不会等待任何来自服务器的响应。
+#        # acks=1 ： 只要集群的首领节点收到消息，生产者就会收到一个来自服务器成功响应。
+#        # acks=all ：只有当所有参与复制的节点全部收到消息时，生产者才会收到一个来自服务器的成功响应。
+#        acks: 0
+#      consumer:
+#        # 自动提交的时间间隔 在spring boot 2.X 版本中这里采用的是值的类型为Duration 需要符合特定的格式，如1S,1M,2H,5D
+#        auto-commit-interval: 1S
+#        # 该属性指定了消费者在读取一个没有偏移量的分区或者偏移量无效的情况下该作何处理：
+#        # latest（默认值）在偏移量无效的情况下，消费者将从最新的记录开始读取数据（在消费者启动之后生成的记录）
+#        # earliest ：在偏移量无效的情况下，消费者将从起始位置读取分区的记录
+#        auto-offset-reset: earliest
+#        # 是否自动提交偏移量，默认值是true,为了避免出现重复数据和数据丢失，可以把它设置为false,然后手动提交偏移量
+#        enable-auto-commit: false
+#        # 键的反序列化方式
+#        key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+#        # 值的反序列化方式
+#        value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+#      listener:
+#        # 在侦听器容器中运行的线程数。
+#        concurrency: 5
+#        #listner负责ack，每调用一次，就立即commit
+#        ack-mode: manual_immediate
+#        missing-topics-fatal: false
   ## quartz定时任务,采用数据库方式
   quartz:
     job-store-type: jdbc
@@ -167,6 +167,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
+          type: com.alibaba.druid.pool.DruidDataSource
           url: jdbc:mysql://152.136.206.27:3306/ems?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: itdm-boot
           password: itdm-boot@2023

jeecg-module-system/jeecg-system-start/src/main/resources/application.yml

@@ -2,4 +2,4 @@ spring:
   application:
     name: jeecg-system
   profiles:
-    active: '@profile.name@'
+    active: 'dev'

jeecg_module_ems/src/main/java/org/jeecg/kafka/consumer/TestConsumer.java

@@ -1,28 +1,28 @@
 package org.jeecg.kafka.consumer;
 
 
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.jeecg.kafka.producer.TestProducer;
-import org.springframework.kafka.annotation.KafkaListener;
-import org.springframework.stereotype.Component;
+//import org.apache.kafka.clients.consumer.ConsumerRecord;
+//import org.jeecg.kafka.producer.TestProducer;
+//import org.springframework.kafka.annotation.KafkaListener;
+//import org.springframework.stereotype.Component;
 
-@Component
-public class TestConsumer {
-
-    /**
-     * 指定一个消费者组，一个主题主题。
-     */
-    @KafkaListener(topics = TestProducer.TOPIC_TEST,groupId = TestProducer.GROUP_TEST)
-    public void simpleConsumer(ConsumerRecord<String, Object> record) {
-        System.out.println("进入simpleConsumer方法");
-        System.out.printf(
-                "分区 = %d, 偏移量 = %d, key = %s, 内容 = %s,创建消息的时间戳 =%d%n",
-                record.partition(),
-                record.offset(),
-                record.key(),
-                record.value(),
-                record.timestamp()
-        );
-    }
-
-}
+//@Component
+//public class TestConsumer {
+//
+//    /**
+//     * 指定一个消费者组，一个主题主题。
+//     */
+//    @KafkaListener(topics = TestProducer.TOPIC_TEST,groupId = TestProducer.GROUP_TEST)
+//    public void simpleConsumer(ConsumerRecord<String, Object> record) {
+//        System.out.println("进入simpleConsumer方法");
+//        System.out.printf(
+//                "分区 = %d, 偏移量 = %d, key = %s, 内容 = %s,创建消息的时间戳 =%d%n",
+//                record.partition(),
+//                record.offset(),
+//                record.key(),
+//                record.value(),
+//                record.timestamp()
+//        );
+//    }
+//
+//}

jeecg_module_ems/src/main/java/org/jeecg/kafka/controller/TestController.java

@@ -1,22 +1,22 @@
 package org.jeecg.kafka.controller;
 
 
-import org.jeecg.kafka.producer.TestProducer;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@RestController
-@RequestMapping("/kafka/test")
-public class TestController {
-
-    @Resource
-    private TestProducer testProducer;
-
-    @GetMapping("/send")
-    public void sendMsg(){
-        testProducer.send("------------测试消息-----------");
-    }
-}
+//import org.jeecg.kafka.producer.TestProducer;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import javax.annotation.Resource;
+//
+//@RestController
+//@RequestMapping("/kafka/test")
+//public class TestController {
+//
+//    @Resource
+//    private TestProducer testProducer;
+//
+//    @GetMapping("/send")
+//    public void sendMsg(){
+//        testProducer.send("------------测试消息-----------");
+//    }
+//}

jeecg_module_ems/src/main/java/org/jeecg/kafka/producer/TestProducer.java

@@ -1,44 +1,44 @@
 package org.jeecg.kafka.producer;
 
-import com.alibaba.fastjson.JSON;
-import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.kafka.support.SendResult;
-import org.springframework.stereotype.Component;
-import org.springframework.util.concurrent.ListenableFuture;
-import org.springframework.util.concurrent.ListenableFutureCallback;
+//import com.alibaba.fastjson.JSON;
+//import lombok.extern.slf4j.Slf4j;
+//import org.jetbrains.annotations.NotNull;
+//import org.springframework.kafka.core.KafkaTemplate;
+//import org.springframework.kafka.support.SendResult;
+//import org.springframework.stereotype.Component;
+//import org.springframework.util.concurrent.ListenableFuture;
+//import org.springframework.util.concurrent.ListenableFutureCallback;
 
 import javax.annotation.Resource;
 
-@Component
-@Slf4j
-public class TestProducer {
-
-    @Resource
-    private KafkaTemplate<String, Object> kafkaTemplate;
-
-    //自定义topic
-    public static final String TOPIC_TEST = "visible";
-
-    public static final String GROUP_TEST = "grout.test";
-    public void send(Object obj) {
-        String obj2String = JSON.toJSONString(obj);
-        log.info("准备发送消息为：{}", obj2String);
-        //发送消息
-        ListenableFuture<SendResult<String, Object>> future = kafkaTemplate.send("TOPIC_TEST", obj);
-        future.addCallback(new ListenableFutureCallback<SendResult<String, Object>>() {
-            @Override
-            public void onFailure(@NotNull Throwable throwable) {
-                //发送失败的处理
-                log.info(TOPIC_TEST + " - 生产者 发送消息失败：" + throwable.getMessage());
-            }
-
-            @Override
-            public void onSuccess(SendResult<String, Object> stringObjectSendResult) {
-                //成功的处理
-                log.info(TOPIC_TEST + " - 生产者 发送消息成功：" + stringObjectSendResult.toString());
-            }
-        });
-    }
-}
+//@Component
+//@Slf4j
+//public class TestProducer {
+//
+//    @Resource
+//    private KafkaTemplate<String, Object> kafkaTemplate;
+//
+//    //自定义topic
+//    public static final String TOPIC_TEST = "visible";
+//
+//    public static final String GROUP_TEST = "grout.test";
+//    public void send(Object obj) {
+//        String obj2String = JSON.toJSONString(obj);
+//        log.info("准备发送消息为：{}", obj2String);
+//        //发送消息
+//        ListenableFuture<SendResult<String, Object>> future = kafkaTemplate.send("TOPIC_TEST", obj);
+//        future.addCallback(new ListenableFutureCallback<SendResult<String, Object>>() {
+//            @Override
+//            public void onFailure(@NotNull Throwable throwable) {
+//                //发送失败的处理
+//                log.info(TOPIC_TEST + " - 生产者 发送消息失败：" + throwable.getMessage());
+//            }
+//
+//            @Override
+//            public void onSuccess(SendResult<String, Object> stringObjectSendResult) {
+//                //成功的处理
+//                log.info(TOPIC_TEST + " - 生产者 发送消息成功：" + stringObjectSendResult.toString());
+//            }
+//        });
+//    }
+//}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectItem/controller/CmmsInspectItemController.java

@@ -187,4 +187,21 @@ public class CmmsInspectItemController extends JeecgController<CmmsInspectItem,
         return super.importExcel(request, response, CmmsInspectItem.class);
     }
 
-}
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: 根据设备id 查询出该设备类型的巡检项
+	  *   date: 2024/1/22
+	  */
+	 @ApiOperation(value="巡检项-通过设备id查询巡检项", notes="巡检项-通过设备id查询巡检项")
+	 @GetMapping(value = "/getItemByEqId")
+	 public Result<List<CmmsInspectItem>> getItemByEqId(@RequestParam(name="eqid",required=true) String eqid) {
+		 List<CmmsInspectItem> list = cmmsInspectItemService.getCmmsInspectItemsByEqid(eqid);
+		 if(list.size() == 0) {
+			 return Result.error("未找到对应数据");
+		 }
+		 return Result.OK(list);
+	 }
+
+ }

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectItem/mapper/CmmsInspectItemMapper.java

@@ -17,4 +17,6 @@ import org.jeecg.modules.cmmsInspectItem.entity.CmmsInspectItemVo;
 public interface CmmsInspectItemMapper extends BaseMapper<CmmsInspectItem> {
 
     List<CmmsInspectItemVo> getCmmsInspectItems(Page<CmmsInspectItemVo> page, @Param("cmmsInspectItem") CmmsInspectItem cmmsInspectItem);
+
+    List<CmmsInspectItem> getCmmsInspectItemsByEqid(@Param("eqid") String eqid);
 }

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectItem/mapper/xml/CmmsInspectItemMapper.xml

@@ -38,4 +38,11 @@
             <if test="cmmsInspectItem.equipdefid != null "> and c.equipdefid = #{cmmsInspectItem.equipdefid}</if>
         </where>
     </select>
+
+
+    <select id="getCmmsInspectItemsByEqid" resultType="org.jeecg.modules.cmmsInspectItem.entity.CmmsInspectItem">
+        <include refid="selectCmmsInspectItemVo" />
+        where equipdefid = (select equipmenttreeid from ems_tpm_equipment where id = #{eqid})  or equipdefid is null
+    </select>
+
 </mapper>

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectItem/service/ICmmsInspectItemService.java

@@ -18,4 +18,6 @@ public interface ICmmsInspectItemService extends IService<CmmsInspectItem> {
     List<CmmsInspectItemVo> getCmmsInspectItems(Page<CmmsInspectItemVo> page, CmmsInspectItem cmmsInspectItem);
 
     boolean addInspectItem(CmmsInspectItem cmmsInspectItem);
+
+    List<CmmsInspectItem> getCmmsInspectItemsByEqid(String eqid);
 }

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectItem/service/impl/CmmsInspectItemServiceImpl.java

@@ -89,4 +89,10 @@ public class CmmsInspectItemServiceImpl extends ServiceImpl<CmmsInspectItemMappe
         //this.save(cmmsInspectItem);
         return this.saveBatch(list);
     }
+
+
+    @Override
+    public List<CmmsInspectItem> getCmmsInspectItemsByEqid(String eqid) {
+        return inspectItemMapper.getCmmsInspectItemsByEqid(eqid);
+    }
 }

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpot/controller/CmmsInspectSpotController.java

@@ -0,0 +1,207 @@
+package org.jeecg.modules.cmmsInspectSpot.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpot;
+import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpotVo;
+import org.jeecg.modules.cmmsInspectSpot.service.ICmmsInspectSpotService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.cmmsInspectSpotEquip.entity.CmmsInspectSpotEquip;
+import org.jeecg.modules.cmmsInspectSpotEquip.service.ICmmsInspectSpotEquipService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 巡检点
+ * @Author: jeecg-boot
+ * @Date:   2024-01-17
+ * @Version: V1.0
+ */
+@Api(tags="巡检点")
+@RestController
+@RequestMapping("/cmmsInspectSpot/cmmsInspectSpot")
+@Slf4j
+public class CmmsInspectSpotController extends JeecgController<CmmsInspectSpot, ICmmsInspectSpotService> {
+	@Autowired
+	@SuppressWarnings("all")
+	private ICmmsInspectSpotService cmmsInspectSpotService;
+	@Autowired
+	@SuppressWarnings("all")
+	private ICmmsInspectSpotEquipService inspectSpotEquipService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cmmsInspectSpot
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "巡检点-分页列表查询")
+	@ApiOperation(value="巡检点-分页列表查询", notes="巡检点-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CmmsInspectSpotVo>> queryPageList(CmmsInspectSpot cmmsInspectSpot,
+														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														  HttpServletRequest req) {
+		//QueryWrapper<CmmsInspectSpot> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectSpot, req.getParameterMap());
+		Page<CmmsInspectSpotVo> page = new Page<CmmsInspectSpotVo>(pageNo, pageSize);
+		//IPage<CmmsInspectSpot> pageList = cmmsInspectSpotService.page(page, queryWrapper);
+		List<CmmsInspectSpotVo> list = cmmsInspectSpotService.getCmmsInspectSpotList(page, cmmsInspectSpot);
+		page.setRecords(list);
+		return Result.OK(page);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cmmsInspectSpot
+	 * @return
+	 */
+	@AutoLog(value = "巡检点-添加")
+	@ApiOperation(value="巡检点-添加", notes="巡检点-添加")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_spot:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CmmsInspectSpotVo cmmsInspectSpot) {
+		//cmmsInspectSpotService.save(cmmsInspectSpot);
+		boolean b = cmmsInspectSpotService.addCmmsInspectSpot(cmmsInspectSpot);
+		if (b) {
+			return Result.OK("添加成功！");
+		}
+		return Result.error("添加失败！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cmmsInspectSpot
+	 * @return
+	 */
+	@AutoLog(value = "巡检点-编辑")
+	@ApiOperation(value="巡检点-编辑", notes="巡检点-编辑")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_spot:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CmmsInspectSpotVo cmmsInspectSpot) {
+		//cmmsInspectSpotService.updateById(cmmsInspectSpot);
+		boolean b = cmmsInspectSpotService.updateCmmsInspectSpot(cmmsInspectSpot);
+		if (b) {
+			return Result.OK("编辑成功!");
+		}
+		return Result.error("编辑失败!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "巡检点-通过id删除")
+	@ApiOperation(value="巡检点-通过id删除", notes="巡检点-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_spot:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		boolean b = cmmsInspectSpotService.removeById(id);
+		QueryWrapper<CmmsInspectSpotEquip> quer = new QueryWrapper<>();
+		quer.eq("inspectspotid",id);
+		boolean b1 = inspectSpotEquipService.remove(quer);
+		if (b && b1){
+			return Result.OK("删除成功!");
+		}
+		return Result.error("删除失败!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "巡检点-批量删除")
+	@ApiOperation(value="巡检点-批量删除", notes="巡检点-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_spot:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		boolean b = this.cmmsInspectSpotService.removeByIds(Arrays.asList(ids.split(",")));
+		QueryWrapper<CmmsInspectSpotEquip> quer = new QueryWrapper<>();
+		quer.in("inspectspotid",Arrays.asList(ids.split(",")));
+		boolean b1 = inspectSpotEquipService.remove(quer);
+		if (b && b1){
+			return Result.OK("批量删除成功!");
+		}
+		return Result.error("批量删除失败!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "巡检点-通过id查询")
+	@ApiOperation(value="巡检点-通过id查询", notes="巡检点-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CmmsInspectSpot> queryById(@RequestParam(name="id",required=true) String id) {
+		//CmmsInspectSpot cmmsInspectSpot = cmmsInspectSpotService.getById(id);
+		CmmsInspectSpotVo cmmsInspectSpot = cmmsInspectSpotService.getCmmsInspectSpotListById(id);
+		if(cmmsInspectSpot==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cmmsInspectSpot);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cmmsInspectSpot
+    */
+    //@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_spot:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CmmsInspectSpot cmmsInspectSpot) {
+        return super.exportXls(request, cmmsInspectSpot, CmmsInspectSpot.class, "巡检点");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("ems_cmms_inspect_spot:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CmmsInspectSpot.class);
+    }
+
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpot/entity/CmmsInspectSpot.java

@@ -0,0 +1,74 @@
+package org.jeecg.modules.cmmsInspectSpot.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 巡检点
+ * @Author: jeecg-boot
+ * @Date:   2024-01-17
+ * @Version: V1.0
+ */
+@Data
+@TableName("ems_cmms_inspect_spot")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ems_cmms_inspect_spot对象", description="巡检点")
+public class CmmsInspectSpot implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**巡检内容ID*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "巡检点ID")
+    private java.lang.String id;
+	/**创建者*/
+    @ApiModelProperty(value = "创建者")
+    private java.lang.String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**更新者*/
+    @ApiModelProperty(value = "更新者")
+    private java.lang.String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private java.util.Date updateTime;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+	/**巡检内容编号*/
+	@Excel(name = "巡检内容编号", width = 15)
+    @ApiModelProperty(value = "巡检点编号")
+    private java.lang.String contentcode;
+	/**巡检内容名称*/
+	@Excel(name = "巡检内容名称", width = 15)
+    @ApiModelProperty(value = "巡检点名称")
+    private java.lang.String contentname;
+	/**设备类型*/
+	@Excel(name = "设备类型", width = 15)
+    @ApiModelProperty(value = "设备类型")
+    private java.lang.String equipdefid;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpot/entity/CmmsInspectSpotVo.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.cmmsInspectSpot.entity;
+
+import lombok.Data;
+import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContent;
+import org.jeecg.modules.cmmsInspectSpotEquip.entity.CmmsInspectSpotEquip;
+
+import java.util.List;
+
+/**
+ * @author dzc
+ * @date 2024/1/17 13:53
+ * @package org.jeecg.modules.cmmsInspectSpot.entity
+ * @project EMS_server
+ * @des
+ */
+@Data
+public class CmmsInspectSpotVo extends CmmsInspectSpot{
+    private String equipdefname;
+
+    private List<CmmsInspectContent> inspectContentList;
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpot/mapper/CmmsInspectSpotMapper.java

@@ -0,0 +1,20 @@
+package org.jeecg.modules.cmmsInspectSpot.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpot;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpotVo;
+
+/**
+ * @Description: 巡检点
+ * @Author: jeecg-boot
+ * @Date:   2024-01-17
+ * @Version: V1.0
+ */
+public interface CmmsInspectSpotMapper extends BaseMapper<CmmsInspectSpot> {
+
+    List<CmmsInspectSpotVo> getCmmsInspectSpotList(@Param("page") Page<CmmsInspectSpotVo> page,@Param("cmmsInspectSpot") CmmsInspectSpot cmmsInspectSpot);
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpot/mapper/xml/CmmsInspectSpotMapper.xml

@@ -0,0 +1,30 @@
+<?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="org.jeecg.modules.cmmsInspectSpot.mapper.CmmsInspectSpotMapper">
+
+    <resultMap type="org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpotVo" id="CmmsInspectContentResult">
+        <result property="id"    column="id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="contentcode"    column="contentcode"    />
+        <result property="contentname"    column="contentname"    />
+        <result property="equipdefid"    column="equipdefid"    />
+        <result property="equipdefname"    column="equipdefname"    />
+        <result property="sysOrgCode"    column="sys_org_code"    />
+    </resultMap>
+
+    <select id="getCmmsInspectSpotList" parameterType="org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpot" resultMap="CmmsInspectContentResult">
+        select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark,
+        c.contentcode, c.contentname, c.equipdefid, c.sys_org_code, t.name as equipdefname
+        from ems_cmms_inspect_spot as c
+        left join ems_tpm_equipment_tree as t
+        on c.equipdefid = t.id
+        <where>
+            <if test="cmmsInspectSpot.contentcode != null  and cmmsInspectSpot.contentcode != ''"> and (c.contentcode like concat('%', #{cmmsInspectSpot.contentcode}, '%') or c.contentname like concat('%', #{cmmsInspectSpot.contentcode}, '%'))</if>
+            <if test="cmmsInspectSpot.equipdefid != null "> and c.equipdefid = #{cmmsInspectSpot.equipdefid}</if>
+        </where>
+    </select>
+</mapper>

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpot/service/ICmmsInspectSpotService.java

@@ -0,0 +1,25 @@
+package org.jeecg.modules.cmmsInspectSpot.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpot;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpotVo;
+
+import java.util.List;
+
+/**
+ * @Description: 巡检点
+ * @Author: jeecg-boot
+ * @Date:   2024-01-17
+ * @Version: V1.0
+ */
+public interface ICmmsInspectSpotService extends IService<CmmsInspectSpot> {
+
+    List<CmmsInspectSpotVo> getCmmsInspectSpotList(Page<CmmsInspectSpotVo> page, CmmsInspectSpot cmmsInspectSpot);
+
+    boolean addCmmsInspectSpot(CmmsInspectSpotVo cmmsInspectSpot);
+
+    boolean updateCmmsInspectSpot(CmmsInspectSpotVo cmmsInspectSpot);
+
+    CmmsInspectSpotVo getCmmsInspectSpotListById(String id);
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpot/service/impl/CmmsInspectSpotServiceImpl.java

@@ -0,0 +1,132 @@
+package org.jeecg.modules.cmmsInspectSpot.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContent;
+import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContentVo;
+import org.jeecg.modules.cmmsInspectContent.service.ICmmsInspectContentService;
+import org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItem;
+import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpot;
+import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpotVo;
+import org.jeecg.modules.cmmsInspectSpot.mapper.CmmsInspectSpotMapper;
+import org.jeecg.modules.cmmsInspectSpot.service.ICmmsInspectSpotService;
+import org.jeecg.modules.cmmsInspectSpotEquip.entity.CmmsInspectSpotEquip;
+import org.jeecg.modules.cmmsInspectSpotEquip.mapper.CmmsInspectSpotEquipMapper;
+import org.jeecg.modules.cmmsInspectSpotEquip.service.ICmmsInspectSpotEquipService;
+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 java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description: 巡检点
+ * @Author: jeecg-boot
+ * @Date:   2024-01-17
+ * @Version: V1.0
+ */
+@Service
+public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMapper, CmmsInspectSpot> implements ICmmsInspectSpotService {
+
+    @Autowired
+    @SuppressWarnings("all")
+    private CmmsInspectSpotMapper inspectSpotMapper;
+
+    @Autowired
+    @SuppressWarnings("all")
+    private AutoCodeUtil autoCodeUtil;
+
+    @Autowired
+    @SuppressWarnings("all")
+    private ICmmsInspectSpotEquipService inspectSpotEquipService;
+
+    @Autowired
+    @SuppressWarnings("all")
+    private ICmmsInspectContentService iCmmsInspectContentService;
+
+
+    @Override
+    public List<CmmsInspectSpotVo> getCmmsInspectSpotList(Page<CmmsInspectSpotVo> page, CmmsInspectSpot cmmsInspectSpot) {
+        return inspectSpotMapper.getCmmsInspectSpotList(page, cmmsInspectSpot);
+    }
+
+    @Override
+    public boolean addCmmsInspectSpot(CmmsInspectSpotVo cmmsInspectSpot) {
+        if (cmmsInspectSpot.getContentcode() == null || "".equals(cmmsInspectSpot.getContentcode())){
+            cmmsInspectSpot.setContentcode(autoCodeUtil.genSerialCode(UserConstants.CMMSINSPECTCONT_CODE, null));
+        }
+        boolean b = this.save(cmmsInspectSpot);
+
+
+        //if (cmmsInspectSpot.getInspectContentList() != null && cmmsInspectSpot.getInspectContentList().size() > 0){
+        //    for (int i = 0; i < cmmsInspectSpot.getInspectContentList().size(); i++) {
+        //        cmmsInspectSpot.getInspectContentList().get(i).setInspectcontid(cmmsInspectSpot.getId());
+        //    }
+        //}
+        insertCmmsInspectcheckContentItem(cmmsInspectSpot);
+
+        return b;
+    }
+
+
+    @Override
+    public boolean updateCmmsInspectSpot(CmmsInspectSpotVo cmmsInspectSpot) {
+        // 根据 巡检点的id 删除巡检点-巡检内容
+        QueryWrapper<CmmsInspectSpotEquip> quer = new QueryWrapper<>();
+        quer.eq("inspectspotid",cmmsInspectSpot.getId());
+        boolean b = inspectSpotEquipService.remove(quer);
+
+        insertCmmsInspectcheckContentItem(cmmsInspectSpot);
+
+        return this.updateById(cmmsInspectSpot);
+    }
+
+
+    @Override
+    public CmmsInspectSpotVo getCmmsInspectSpotListById(String id) {
+        // 根据id查询出巡检点的信息
+        CmmsInspectSpot cmmsInspectSport = this.getById(id);
+
+        // 根据 巡检点的id 查询出巡检点-巡检内容的信息
+        List<CmmsInspectSpotEquip> list = inspectSpotEquipService.getInspectSpotEquipBySprtId(cmmsInspectSport.getId());
+        ArrayList<CmmsInspectContent> contList = new ArrayList<>();
+        for (CmmsInspectSpotEquip eq:list) {
+            String equipmentid = eq.getInspectcontid();
+            CmmsInspectContentVo cmmsInspectContent = iCmmsInspectContentService.getCmmsInspectContentById(equipmentid);
+            contList.add(cmmsInspectContent);
+        }
+        CmmsInspectSpotVo cmmsInspectSpotVo = new CmmsInspectSpotVo();
+        if (ObjectUtil.isNotNull(cmmsInspectSport.getContentcode())) cmmsInspectSpotVo.setContentcode(cmmsInspectSport.getContentcode());
+        if (ObjectUtil.isNotNull(cmmsInspectSport.getContentname())) cmmsInspectSpotVo.setContentname(cmmsInspectSport.getContentname());
+        if (ObjectUtil.isNotNull(cmmsInspectSport.getEquipdefid())) cmmsInspectSpotVo.setEquipdefid(cmmsInspectSport.getEquipdefid());
+        if (ObjectUtil.isNotNull(cmmsInspectSport.getRemark())) cmmsInspectSpotVo.setRemark(cmmsInspectSport.getRemark());
+        if (ObjectUtil.isNotNull(cmmsInspectSport.getId())) cmmsInspectSpotVo.setId(cmmsInspectSport.getId());
+        if (ObjectUtil.isNotNull(cmmsInspectSport.getSysOrgCode())) cmmsInspectSpotVo.setSysOrgCode(cmmsInspectSport.getSysOrgCode());
+        if (ObjectUtil.isNotNull(cmmsInspectSport.getCreateBy())) cmmsInspectSpotVo.setCreateBy(cmmsInspectSport.getCreateBy());
+        if (ObjectUtil.isNotNull(cmmsInspectSport.getCreateTime())) cmmsInspectSpotVo.setCreateTime(cmmsInspectSport.getCreateTime());
+        if (ObjectUtil.isNotNull(cmmsInspectSport.getUpdateBy())) cmmsInspectSpotVo.setUpdateBy(cmmsInspectSport.getUpdateBy());
+        if (ObjectUtil.isNotNull(cmmsInspectSport.getUpdateTime())) cmmsInspectSpotVo.setUpdateTime(cmmsInspectSport.getUpdateTime());
+        cmmsInspectSpotVo.setInspectContentList(contList);
+        return cmmsInspectSpotVo;
+    }
+
+    private void insertCmmsInspectcheckContentItem(CmmsInspectSpotVo cmmsInspectSpot) {
+        List<CmmsInspectContent> list = cmmsInspectSpot.getInspectContentList();
+        String id = cmmsInspectSpot.getId();
+        if (ObjectUtil.isNotNull(list)){
+            ArrayList<CmmsInspectSpotEquip> list1 = new ArrayList<>();
+            for (CmmsInspectContent e:list) {
+                CmmsInspectSpotEquip cmmsInspectSpotEquip = new CmmsInspectSpotEquip();
+                cmmsInspectSpotEquip.setInspectspotid(id);  // 巡检点id
+                cmmsInspectSpotEquip.setInspectcontid(e.getId()); // 巡检内容id
+                list1.add(cmmsInspectSpotEquip);
+            }
+            inspectSpotEquipService.saveBatch(list1);
+        }
+    }
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpotEquip/controller/CmmsInspectSpotEquipController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.cmmsInspectSpotEquip.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.cmmsInspectSpotEquip.entity.CmmsInspectSpotEquip;
+import org.jeecg.modules.cmmsInspectSpotEquip.service.ICmmsInspectSpotEquipService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 巡检点-设备
+ * @Author: jeecg-boot
+ * @Date:   2024-01-17
+ * @Version: V1.0
+ */
+@Api(tags="巡检点-设备")
+@RestController
+@RequestMapping("/cmmsInspectSpotEquip/cmmsInspectSpotEquip")
+@Slf4j
+public class CmmsInspectSpotEquipController extends JeecgController<CmmsInspectSpotEquip, ICmmsInspectSpotEquipService> {
+	@Autowired
+	private ICmmsInspectSpotEquipService cmmsInspectSpotEquipService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cmmsInspectSpotEquip
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "巡检点-设备-分页列表查询")
+	@ApiOperation(value="巡检点-设备-分页列表查询", notes="巡检点-设备-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CmmsInspectSpotEquip>> queryPageList(CmmsInspectSpotEquip cmmsInspectSpotEquip,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CmmsInspectSpotEquip> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectSpotEquip, req.getParameterMap());
+		Page<CmmsInspectSpotEquip> page = new Page<CmmsInspectSpotEquip>(pageNo, pageSize);
+		IPage<CmmsInspectSpotEquip> pageList = cmmsInspectSpotEquipService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cmmsInspectSpotEquip
+	 * @return
+	 */
+	@AutoLog(value = "巡检点-设备-添加")
+	@ApiOperation(value="巡检点-设备-添加", notes="巡检点-设备-添加")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_spot_equip:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CmmsInspectSpotEquip cmmsInspectSpotEquip) {
+		cmmsInspectSpotEquipService.save(cmmsInspectSpotEquip);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cmmsInspectSpotEquip
+	 * @return
+	 */
+	@AutoLog(value = "巡检点-设备-编辑")
+	@ApiOperation(value="巡检点-设备-编辑", notes="巡检点-设备-编辑")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_spot_equip:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CmmsInspectSpotEquip cmmsInspectSpotEquip) {
+		cmmsInspectSpotEquipService.updateById(cmmsInspectSpotEquip);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "巡检点-设备-通过id删除")
+	@ApiOperation(value="巡检点-设备-通过id删除", notes="巡检点-设备-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_spot_equip:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cmmsInspectSpotEquipService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "巡检点-设备-批量删除")
+	@ApiOperation(value="巡检点-设备-批量删除", notes="巡检点-设备-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_spot_equip:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cmmsInspectSpotEquipService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "巡检点-设备-通过id查询")
+	@ApiOperation(value="巡检点-设备-通过id查询", notes="巡检点-设备-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CmmsInspectSpotEquip> queryById(@RequestParam(name="id",required=true) String id) {
+		CmmsInspectSpotEquip cmmsInspectSpotEquip = cmmsInspectSpotEquipService.getById(id);
+		if(cmmsInspectSpotEquip==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cmmsInspectSpotEquip);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cmmsInspectSpotEquip
+    */
+    //@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_spot_equip:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CmmsInspectSpotEquip cmmsInspectSpotEquip) {
+        return super.exportXls(request, cmmsInspectSpotEquip, CmmsInspectSpotEquip.class, "巡检点-设备");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("ems_cmms_inspect_spot_equip:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CmmsInspectSpotEquip.class);
+    }
+
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpotEquip/entity/CmmsInspectSpotEquip.java

@@ -0,0 +1,54 @@
+package org.jeecg.modules.cmmsInspectSpotEquip.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 巡检点-设备
+ * @Author: jeecg-boot
+ * @Date:   2024-01-17
+ * @Version: V1.0
+ */
+@Data
+@TableName("ems_cmms_inspect_spot_equip")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ems_cmms_inspect_spot_equip对象", description="巡检点-设备")
+public class CmmsInspectSpotEquip implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**巡检内容-设备ID*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "巡检点-设备ID")
+    private java.lang.String id;
+	/**巡检内容ID*/
+	@Excel(name = "巡检内容ID", width = 15)
+    @ApiModelProperty(value = "巡检点ID")
+    private java.lang.String inspectspotid;
+	/**设备ID*/
+	@Excel(name = "设备ID", width = 15)
+    @ApiModelProperty(value = "巡检内容ID")
+    private java.lang.String inspectcontid;
+	/**已配置巡检项数量*/
+	@Excel(name = "已配置巡检项数量", width = 15)
+    @ApiModelProperty(value = "已配置巡检项数量")
+    private java.lang.Integer itemnum;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpotEquip/mapper/CmmsInspectSpotEquipMapper.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.cmmsInspectSpotEquip.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cmmsInspectSpotEquip.entity.CmmsInspectSpotEquip;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 巡检点-设备
+ * @Author: jeecg-boot
+ * @Date:   2024-01-17
+ * @Version: V1.0
+ */
+public interface CmmsInspectSpotEquipMapper extends BaseMapper<CmmsInspectSpotEquip> {
+
+    List<CmmsInspectSpotEquip> getInspectSpotEquipBySprtId(@Param("id") String id);
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpotEquip/mapper/xml/CmmsInspectSpotEquipMapper.xml

@@ -0,0 +1,18 @@
+<?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="org.jeecg.modules.cmmsInspectSpotEquip.mapper.CmmsInspectSpotEquipMapper">
+
+
+    <resultMap type="org.jeecg.modules.cmmsInspectSpotEquip.entity.CmmsInspectSpotEquip" id="CmmsInspectContentEquipResult">
+        <result property="id"    column="id"    />
+        <result property="inspectspotid"    column="inspectspotid"    />
+        <result property="inspectcontid"    column="inspectcontid"    />
+        <result property="itemnum"    column="itemnum"    />
+    </resultMap>
+
+    <select id="getInspectSpotEquipBySprtId" parameterType="String" resultMap="CmmsInspectContentEquipResult">
+        select * from ems_cmms_inspect_spot_equip where inspectspotid = #{id}
+    </select>
+
+
+</mapper>

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpotEquip/service/ICmmsInspectSpotEquipService.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.cmmsInspectSpotEquip.service;
+
+import org.jeecg.modules.cmmsInspectSpotEquip.entity.CmmsInspectSpotEquip;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * @Description: 巡检点-设备
+ * @Author: jeecg-boot
+ * @Date:   2024-01-17
+ * @Version: V1.0
+ */
+public interface ICmmsInspectSpotEquipService extends IService<CmmsInspectSpotEquip> {
+
+    List<CmmsInspectSpotEquip> getInspectSpotEquipBySprtId(String id);
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpotEquip/service/impl/CmmsInspectSpotEquipServiceImpl.java

@@ -0,0 +1,30 @@
+package org.jeecg.modules.cmmsInspectSpotEquip.service.impl;
+
+import org.jeecg.modules.cmmsInspectSpotEquip.entity.CmmsInspectSpotEquip;
+import org.jeecg.modules.cmmsInspectSpotEquip.mapper.CmmsInspectSpotEquipMapper;
+import org.jeecg.modules.cmmsInspectSpotEquip.service.ICmmsInspectSpotEquipService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.List;
+
+/**
+ * @Description: 巡检点-设备
+ * @Author: jeecg-boot
+ * @Date:   2024-01-17
+ * @Version: V1.0
+ */
+@Service
+public class CmmsInspectSpotEquipServiceImpl extends ServiceImpl<CmmsInspectSpotEquipMapper, CmmsInspectSpotEquip> implements ICmmsInspectSpotEquipService {
+
+    @Autowired
+    @SuppressWarnings("all")
+    private CmmsInspectSpotEquipMapper inspectSpotEquipMapper;
+
+    @Override
+    public List<CmmsInspectSpotEquip> getInspectSpotEquipBySprtId(String id) {
+        return inspectSpotEquipMapper.getInspectSpotEquipBySprtId(id);
+    }
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpotItem/controller/CmmsInspectSpotItemController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.cmmsInspectSpotItem.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.cmmsInspectSpotItem.entity.CmmsInspectSpotItem;
+import org.jeecg.modules.cmmsInspectSpotItem.service.ICmmsInspectSpotItemService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 巡检点-巡检项
+ * @Author: jeecg-boot
+ * @Date:   2024-01-17
+ * @Version: V1.0
+ */
+@Api(tags="巡检点-巡检项")
+@RestController
+@RequestMapping("/cmmsInspectSpotItem/cmmsInspectSpotItem")
+@Slf4j
+public class CmmsInspectSpotItemController extends JeecgController<CmmsInspectSpotItem, ICmmsInspectSpotItemService> {
+	@Autowired
+	private ICmmsInspectSpotItemService cmmsInspectSpotItemService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cmmsInspectSpotItem
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "巡检点-巡检项-分页列表查询")
+	@ApiOperation(value="巡检点-巡检项-分页列表查询", notes="巡检点-巡检项-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CmmsInspectSpotItem>> queryPageList(CmmsInspectSpotItem cmmsInspectSpotItem,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CmmsInspectSpotItem> queryWrapper = QueryGenerator.initQueryWrapper(cmmsInspectSpotItem, req.getParameterMap());
+		Page<CmmsInspectSpotItem> page = new Page<CmmsInspectSpotItem>(pageNo, pageSize);
+		IPage<CmmsInspectSpotItem> pageList = cmmsInspectSpotItemService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cmmsInspectSpotItem
+	 * @return
+	 */
+	@AutoLog(value = "巡检点-巡检项-添加")
+	@ApiOperation(value="巡检点-巡检项-添加", notes="巡检点-巡检项-添加")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_spot_item:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CmmsInspectSpotItem cmmsInspectSpotItem) {
+		cmmsInspectSpotItemService.save(cmmsInspectSpotItem);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cmmsInspectSpotItem
+	 * @return
+	 */
+	@AutoLog(value = "巡检点-巡检项-编辑")
+	@ApiOperation(value="巡检点-巡检项-编辑", notes="巡检点-巡检项-编辑")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_spot_item:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CmmsInspectSpotItem cmmsInspectSpotItem) {
+		cmmsInspectSpotItemService.updateById(cmmsInspectSpotItem);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "巡检点-巡检项-通过id删除")
+	@ApiOperation(value="巡检点-巡检项-通过id删除", notes="巡检点-巡检项-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_spot_item:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cmmsInspectSpotItemService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "巡检点-巡检项-批量删除")
+	@ApiOperation(value="巡检点-巡检项-批量删除", notes="巡检点-巡检项-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_spot_item:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cmmsInspectSpotItemService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "巡检点-巡检项-通过id查询")
+	@ApiOperation(value="巡检点-巡检项-通过id查询", notes="巡检点-巡检项-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CmmsInspectSpotItem> queryById(@RequestParam(name="id",required=true) String id) {
+		CmmsInspectSpotItem cmmsInspectSpotItem = cmmsInspectSpotItemService.getById(id);
+		if(cmmsInspectSpotItem==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cmmsInspectSpotItem);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cmmsInspectSpotItem
+    */
+    //@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_spot_item:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CmmsInspectSpotItem cmmsInspectSpotItem) {
+        return super.exportXls(request, cmmsInspectSpotItem, CmmsInspectSpotItem.class, "巡检点-巡检项");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("ems_cmms_inspect_spot_item:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CmmsInspectSpotItem.class);
+    }
+
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpotItem/entity/CmmsInspectSpotItem.java

@@ -0,0 +1,50 @@
+package org.jeecg.modules.cmmsInspectSpotItem.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 巡检点-巡检项
+ * @Author: jeecg-boot
+ * @Date:   2024-01-17
+ * @Version: V1.0
+ */
+@Data
+@TableName("ems_cmms_inspect_spot_item")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ems_cmms_inspect_spot_item对象", description="巡检点-巡检项")
+public class CmmsInspectSpotItem implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**巡检内容-巡检项ID*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "巡检内容-巡检项ID")
+    private java.lang.String id;
+	/**巡检内容-设备ID*/
+	@Excel(name = "巡检内容-设备ID", width = 15)
+    @ApiModelProperty(value = "巡检内容-设备ID")
+    private java.lang.String contequiptid;
+	/**巡检项ID*/
+	@Excel(name = "巡检项ID", width = 15)
+    @ApiModelProperty(value = "巡检项ID")
+    private java.lang.String inspectitemid;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpotItem/mapper/CmmsInspectSpotItemMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.cmmsInspectSpotItem.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cmmsInspectSpotItem.entity.CmmsInspectSpotItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 巡检点-巡检项
+ * @Author: jeecg-boot
+ * @Date:   2024-01-17
+ * @Version: V1.0
+ */
+public interface CmmsInspectSpotItemMapper extends BaseMapper<CmmsInspectSpotItem> {
+
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpotItem/mapper/xml/CmmsInspectSpotItemMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.cmmsInspectSpotItem.mapper.CmmsInspectSpotItemMapper">
+
+</mapper>

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpotItem/service/ICmmsInspectSpotItemService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.cmmsInspectSpotItem.service;
+
+import org.jeecg.modules.cmmsInspectSpotItem.entity.CmmsInspectSpotItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 巡检点-巡检项
+ * @Author: jeecg-boot
+ * @Date:   2024-01-17
+ * @Version: V1.0
+ */
+public interface ICmmsInspectSpotItemService extends IService<CmmsInspectSpotItem> {
+
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpotItem/service/impl/CmmsInspectSpotItemServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cmmsInspectSpotItem.service.impl;
+
+import org.jeecg.modules.cmmsInspectSpotItem.entity.CmmsInspectSpotItem;
+import org.jeecg.modules.cmmsInspectSpotItem.mapper.CmmsInspectSpotItemMapper;
+import org.jeecg.modules.cmmsInspectSpotItem.service.ICmmsInspectSpotItemService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 巡检点-巡检项
+ * @Author: jeecg-boot
+ * @Date:   2024-01-17
+ * @Version: V1.0
+ */
+@Service
+public class CmmsInspectSpotItemServiceImpl extends ServiceImpl<CmmsInspectSpotItemMapper, CmmsInspectSpotItem> implements ICmmsInspectSpotItemService {
+
+}

jeecg_module_ems/src/main/java/org/jeecg/modules/cronJob/GenerateDataJob.java

@@ -1,8 +1,6 @@
 package org.jeecg.modules.cronJob;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.modules.dataCurrent.entity.DataCurrent;
 import org.jeecg.modules.dataCurrent.service.IDataCurrentService;
@@ -16,11 +14,10 @@ import org.jeecg.modules.tpmEquipment.entity.TpmEquipment;
 import org.jeecg.modules.tpmEquipment.service.ITpmEquipmentService;
 import org.jeecg.modules.tpmTag.entity.TpmTag;
 import org.jeecg.modules.tpmTag.service.ITpmTagService;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
@@ -30,7 +27,7 @@ import java.util.Date;
 import java.util.List;
 
 @Component
-public class GenerateDataJob implements Job {
+public class GenerateDataJob  {
 
     @Autowired
     private ITpmEquipmentService equipmentService; //设备service
@@ -45,8 +42,8 @@ public class GenerateDataJob implements Job {
     @Autowired
     private IDataVoltageService voltageService; //设备实时电压service
 
-    @Override
-    public void execute(JobExecutionContext context) throws JobExecutionException {
+    //@Scheduled(cron = "0 * * * * ?")
+    public void execute() throws JobExecutionException {
         // 电流值范围：20-50、电压值范围：350-450、需量：400-1500、用电量、0-1.5
         // tagtype:4需量、5电流、6电压、7电量