Merge remote-tracking branch 'origin/master'

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/controller/ItdmDeviceController.java

@@ -1,43 +1,31 @@
 package org.jeecg.modules.itdmDevice.controller;
 
-import java.util.Arrays;
-import java.util.Date;
-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.itdmDevice.entity.ItdmDevice;
-import org.jeecg.modules.itdmDevice.service.IItdmDeviceService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 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.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.itdmDevice.convert.ItdmDeviceConvert1;
+import org.jeecg.modules.itdmDevice.entity.ItdmDevice;
+import org.jeecg.modules.itdmDevice.service.IItdmDeviceService;
+import org.jeecg.modules.itdmDevice.vo.ItdmDeviceXLListVO;
 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;
 
- /**
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
  * @Description: 设备表
  * @Author: jeecg-boot
  * @Date:   2023-05-20
@@ -56,10 +44,17 @@ public class ItdmDeviceController extends JeecgController<ItdmDevice, IItdmDevic
 	  */
 	 @ApiOperation(value="设备下拉列表", notes="设备下拉列表")
 	 @GetMapping("/xialalist")
-	 public List<ItdmDevice> list1()
+	 public List<ItdmDeviceXLListVO> list1()
 	 {
 		 List<ItdmDevice> list = itdmDeviceService.queryList();
-		 return list;
+		 List<ItdmDeviceXLListVO> list1 = list.stream().map(i->{
+		 	String zyxbzText ="";
+		 	if(i.getZyxbz()==0) zyxbzText ="气候试验";
+		 	else if(i.getZyxbz()==1) zyxbzText ="力学试验";
+		 	else if(i.getZyxbz()==2) zyxbzText ="重要试验";
+			return ItdmDeviceConvert1.INSTANCE.convert(i,zyxbzText);
+		 }).collect(Collectors.toList());
+		 return list1;
 	 }
 
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/convert/ItdmDeviceConvert1.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.itdmDevice.convert;
+
+import org.jeecg.modules.itdmDevice.entity.ItdmDevice;
+import org.jeecg.modules.itdmDevice.vo.ItdmDeviceXLListVO;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.util.CollectionUtils;
+
+import java.util.stream.Collectors;
+
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
+public interface ItdmDeviceConvert1 {
+
+    ItdmDeviceConvert1 INSTANCE = Mappers.getMapper(ItdmDeviceConvert1.class);
+
+    ItdmDeviceXLListVO convert(ItdmDevice itdmDevice, String zyxbzText);
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/entity/ItdmDevice.java

@@ -129,4 +129,22 @@ public class ItdmDevice implements Serializable {
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
+    /**单价*/
+    @Excel(name = "单价", width = 15)
+    @ApiModelProperty(value = "单价")
+    private java.lang.Integer danjia;
+    /**是否能删除（0不可删除1可删除）*/
+    @Excel(name = "是否能删除", width = 15)
+    @ApiModelProperty(value = "是否能删除")
+    private java.lang.Integer izDelete;
+    /**重要性标准*/
+    @Excel(name = "重要性标准", width = 15, dicCode = "shiyan_shebe_type")
+    @Dict(dicCode = "shiyan_shebe_type")
+    @ApiModelProperty(value = "重要性标准")
+    private java.lang.Integer zyxbz;
+    /**是否在大屏展示（0不展示1展示）*/
+    @Excel(name = "是否在大屏展示", width = 15)
+    @ApiModelProperty(value = "是否在大屏展示")
+    private java.lang.Integer izDisplay;
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/vo/ItdmDeviceXLListVO.java

@@ -0,0 +1,139 @@
+package org.jeecg.modules.itdmDevice.vo;
+
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+public class ItdmDeviceXLListVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+    /**创建日期*/
+    @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 createTime;
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+    /**更新日期*/
+    @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 updateTime;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+    /**设备名称*/
+    @Excel(name = "设备名称", width = 15)
+    @ApiModelProperty(value = "设备名称")
+    private java.lang.String deviceName;
+    /**设备类型*/
+    @Excel(name = "设备类型", width = 15)
+    @ApiModelProperty(value = "设备类型")
+    private java.lang.String deviceType;
+    /**设备编号*/
+    @Excel(name = "设备编号", width = 15)
+    @ApiModelProperty(value = "设备编号")
+    private java.lang.String deviceNo;
+    /**设备状态*/
+    @Excel(name = "设备状态", width = 15, dicCode = "device_status")
+    @Dict(dicCode = "device_status")
+    @ApiModelProperty(value = "设备状态")
+    private java.lang.Integer deviceStatus;
+    /**维护时间*/
+    @TableField(value = "repair_time", updateStrategy = FieldStrategy.IGNORED)
+    @Excel(name = "维护时间", width = 20, 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 repairTime;
+    /**维护人*/
+    @Excel(name = "维护人", width = 15)
+    @ApiModelProperty(value = "维护人")
+    private java.lang.String repairer;
+    /**维护记录*/
+    @Excel(name = "维护记录", width = 15)
+    @ApiModelProperty(value = "维护记录")
+    private java.lang.String record;
+    /**设备规格*/
+    @Excel(name = "设备规格", width = 15)
+    @ApiModelProperty(value = "设备规格")
+    private java.lang.String deviceSpecification;
+    /**设备型号*/
+    @Excel(name = "设备型号", width = 15)
+    @ApiModelProperty(value = "设备型号")
+    private java.lang.String deviceModel;
+    /**计量有效期*/
+    @Excel(name = "计量有效期", width = 15)
+    @ApiModelProperty(value = "计量有效期")
+    private java.lang.String deviceLife;
+    /**本次运行开始时间*/
+    @Excel(name = "本次运行开始时间", width = 20, 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 runStartTime;
+    /**设备运行标识*/
+    @Excel(name = "设备运行标识", width = 15, dicCode = "biaoshi")
+    @Dict(dicCode = "biaoshi")
+    @ApiModelProperty(value = "设备运行标识")
+    private java.lang.Integer biaoshi;
+    /**是否已维护*/
+    @Excel(name = "是否已维护(0未维护1已维护)", width = 15, dicCode = "is_repair")
+    @Dict(dicCode = "is_repair")
+    @ApiModelProperty(value = "是否已维护(0未维护1已维护)")
+    private java.lang.Integer isRepair;
+    /**设备树id*/
+    @Excel(name = "设备树id", width = 15)
+    @ApiModelProperty(value = "设备树id")
+    private java.lang.Integer equipmenttreeid;
+    /**安装地点*/
+    @Excel(name = "安装地点", width = 15)
+    @ApiModelProperty(value = "安装地点")
+    private java.lang.String address;
+    /**区域*/
+    @Excel(name = "区域", width = 15)
+    @ApiModelProperty(value = "区域")
+    private java.lang.Integer specid;
+    /**备注*/
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+    /**单价*/
+    @Excel(name = "单价", width = 15)
+    @ApiModelProperty(value = "单价")
+    private java.lang.Integer danjia;
+    /**是否能删除（0不可删除1可删除）*/
+    @Excel(name = "是否能删除", width = 15)
+    @ApiModelProperty(value = "是否能删除")
+    private java.lang.Integer izDelete;
+    /**重要性标准*/
+    @Excel(name = "重要性标准", width = 15, dicCode = "shiyan_shebe_type")
+    @Dict(dicCode = "shiyan_shebe_type")
+    @ApiModelProperty(value = "重要性标准")
+    private java.lang.Integer zyxbz;
+    /**重要性标准——文字版*/
+    @Excel(name = "重要性标准——文字版", width = 15)
+    @ApiModelProperty(value = "重要性标准——文字版")
+    private java.lang.String zyxbzText;
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmWenxiangHistory/mapper/YCDataMapper.java

@@ -10,31 +10,31 @@ public interface YCDataMapper {
 
     /**删除0.5立方硬采表所给日期之前的所有数据*/
     @Select("delete from cssy_yj_w05 where gather_time <= #{lastYearOfToday}")
-    void truncateYCDataByTime05(@Param("lastYearOfToday") Date lastYearOfToday);
+    void deleteYCDataByTime05(@Param("lastYearOfToday") Date lastYearOfToday);
 
     /**删除1立方硬采表所给日期之前的所有数据*/
     @Select("delete from cssy_yj_w1 where gather_time <= #{lastYearOfToday}")
-    void truncateYCDataByTime1(@Param("lastYearOfToday") Date lastYearOfToday);
+    void deleteYCDataByTime1(@Param("lastYearOfToday") Date lastYearOfToday);
 
     /**删除8立方硬采表所给日期之前的所有数据*/
     @Select("delete from cssy_yj_w8 where gather_time <= #{lastYearOfToday}")
-    void truncateYCDataByTime8(@Param("lastYearOfToday") Date lastYearOfToday);
+    void deleteYCDataByTime8(@Param("lastYearOfToday") Date lastYearOfToday);
 
     /**删除16立方硬采表所给日期之前的所有数据*/
     @Select("delete from cssy_yj_w16 where gather_time <= #{lastYearOfToday}")
-    void truncateYCDataByTime16(@Param("lastYearOfToday") Date lastYearOfToday);
+    void deleteYCDataByTime16(@Param("lastYearOfToday") Date lastYearOfToday);
 
     /**删除48立方硬采表所给日期之前的所有数据*/
     @Select("delete from cssy_yj_w48 where gather_time <= #{lastYearOfToday}")
-    void truncateYCDataByTime48(@Param("lastYearOfToday") Date lastYearOfToday);
+    void deleteYCDataByTime48(@Param("lastYearOfToday") Date lastYearOfToday);
 
     /**删除霉菌硬采表所给日期之前的所有数据*/
     @Select("delete from cssy_yj_wmj where gather_time <= #{lastYearOfToday}")
-    void truncateYCDataByTimeMJ(@Param("lastYearOfToday") Date lastYearOfToday);
+    void deleteYCDataByTimeMJ(@Param("lastYearOfToday") Date lastYearOfToday);
 
     /**删除三综合硬采表所给日期之前的所有数据*/
     @Select("delete from cssy_yj_wszh where gather_time <= #{lastYearOfToday}")
-    void truncateYCDataByTimeSZH(@Param("lastYearOfToday") Date lastYearOfToday);
+    void deleteYCDataByTimeSZH(@Param("lastYearOfToday") Date lastYearOfToday);
 
 
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/largeScreen/task/DemoTask2.java

@@ -96,7 +96,10 @@ public class DemoTask2 {
          * 3 故障——故障状态中，不根据硬件传过来的设备状态而修改故障状态
          * 4 解除故障
          * */
-        List<ItdmDevice> deviceList = deviceService.queryList();
+//        List<ItdmDevice> deviceList = deviceService.queryList();
+        Map<String, Object> deviceMap = new HashMap<>();
+        deviceMap.put("iz_display",1);
+        List<ItdmDevice> deviceList = deviceService.listByMap(deviceMap);
         List<ItdmDeviceWSVO> deviceWSVOList = deviceList.stream().map(i->{
                 return ItdmDeviceConvert.INSTANCE.convert(i);
         }).collect(Collectors.toList());

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/largeScreen/task/DemoTask3.java

@@ -95,7 +95,10 @@ public class DemoTask3 {
          * 3 故障——故障状态中，不根据硬件传过来的设备状态而修改故障状态
          * 4 解除故障
          * */
-        List<ItdmDevice> deviceList = deviceService.queryList();
+//        List<ItdmDevice> deviceList = deviceService.queryList();
+        Map<String, Object> deviceMap = new HashMap<>();
+        deviceMap.put("iz_display",1);
+        List<ItdmDevice> deviceList = deviceService.listByMap(deviceMap);
         List<ItdmDeviceWSVO> deviceWSVOList = deviceList.stream().map(i->{
             return ItdmDeviceConvert.INSTANCE.convert(i);
         }).collect(Collectors.toList());

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/largeScreen/task/TaskUtils.java

@@ -5,15 +5,14 @@ import org.jeecg.modules.itdmAlarm.mapper.ItdmAlarmMapper;
 import org.jeecg.modules.itdmAlarm.service.IItdmAlarmService;
 import org.jeecg.modules.itdmAlarmTotal.entity.ItdmAlarmTotal;
 import org.jeecg.modules.itdmAlarmTotal.service.IItdmAlarmTotalService;
+import org.jeecg.modules.itdmDataHistory.mapper.ItdmWenxiangMapper;
+import org.jeecg.modules.itdmWenxiangHistory.mapper.YCDataMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Component // 把此类托管给 Spring，不能省略
 public class TaskUtils {
@@ -27,6 +26,12 @@ public class TaskUtils {
     @Autowired
     @SuppressWarnings("all")
     private ItdmAlarmMapper alarmMapper;
+    @Autowired
+    @SuppressWarnings("all")
+    private ItdmWenxiangMapper wenxiangMapper;
+    @Autowired
+    @SuppressWarnings("all")
+    private YCDataMapper ycDataMapper;
 
 
     // 添加定时任务
@@ -98,5 +103,37 @@ public class TaskUtils {
             alarmTotalService.save(alarmTotal);
         }
     }
+
+    //删除所有温箱设备一年之前的数据
+    @Scheduled(cron = "30 30 13 * * 7") // cron 表达式，每周日13点30分30秒 执行
+    public void deleteData(){
+        System.out.println("我是定时任务————删除所有温箱设备一年之前的数据");
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date()); //当前时间
+        calendar.add(Calendar.YEAR, -1);//当前时间减去一年，即一年前的时间
+        Date lastYearOfToday = calendar.getTime(); //获取去年的今天
+        System.out.println("删除原温箱历史数据表该时间之前的所有数据:"+ lastYearOfToday);
+        wenxiangMapper.deleteByTime(lastYearOfToday);
+
+
+        System.out.println("删除硬采0.5温箱历史数据表该时间之前的所有数据:"+ lastYearOfToday);
+        ycDataMapper.deleteYCDataByTime05(lastYearOfToday);
+        System.out.println("删除硬采1温箱历史数据表该时间之前的所有数据:"+ lastYearOfToday);
+        ycDataMapper.deleteYCDataByTime1(lastYearOfToday);
+        System.out.println("删除硬采8温箱历史数据表该时间之前的所有数据:"+ lastYearOfToday);
+        ycDataMapper.deleteYCDataByTime8(lastYearOfToday);
+        System.out.println("删除硬采16温箱历史数据表该时间之前的所有数据:"+ lastYearOfToday);
+        ycDataMapper.deleteYCDataByTime16(lastYearOfToday);
+        System.out.println("删除硬采48温箱历史数据表该时间之前的所有数据:"+ lastYearOfToday);
+        ycDataMapper.deleteYCDataByTime48(lastYearOfToday);
+        System.out.println("删除硬采霉菌温箱历史数据表该时间之前的所有数据:"+ lastYearOfToday);
+        ycDataMapper.deleteYCDataByTimeMJ(lastYearOfToday);
+        System.out.println("删除硬采三综合温箱历史数据表该时间之前的所有数据:"+ lastYearOfToday);
+        ycDataMapper.deleteYCDataByTimeSZH(lastYearOfToday);
+        System.out.println("删除完成："+ lastYearOfToday);
+    }
+
+
 }