改了一些东西

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckTitem/convert/CmmsSpotcheckTitemConvert.java

@@ -28,10 +28,10 @@ public interface CmmsSpotcheckTitemConvert {
     @Mapping(target="conditions", source = "item.conditions")
     @Mapping(target="tag", source = "item.tag")
     @Mapping(target="itemtype", source = "item.itemtype")
-    @Mapping(target="createBy", ignore = true)
-    @Mapping(target="createTime", ignore = true)
-    @Mapping(target="updateBy", ignore = true)
-    @Mapping(target="updateTime", ignore = true)
+//    @Mapping(target="createBy", ignore = true)
+//    @Mapping(target="createTime", ignore = true)
+//    @Mapping(target="updateBy", ignore = true)
+//    @Mapping(target="updateTime", ignore = true)
     @Mapping(target="sysOrgCode", ignore = true)
     CmmsSpotcheckTitem convert(CmmsSpotcheckItem item, CmmsSpotcheckContentItem contentItem, CmmsSpotcheckContent content);
 

module_tpm/src/main/java/org/jeecg/modules/equipmentOnoff/service/impl/EquipmentOnoffServiceImpl.java

@@ -71,6 +71,7 @@ public class EquipmentOnoffServiceImpl extends ServiceImpl<EquipmentOnoffMapper,
         return dateMap;
     }
 
+    @Override
     public Result<List<Map<String, Object>>> getEquipmentHistoryData1(HistoryParamDto historyParamDto){
         List<Map<String, Object>> historyList = new ArrayList<>();
         List<Collectdata> orgDataList = new ArrayList<>();
@@ -104,6 +105,7 @@ public class EquipmentOnoffServiceImpl extends ServiceImpl<EquipmentOnoffMapper,
         return Result.ok(historyList);
     }
 
+    @Override
     public Result<List<Map<String, Object>>> getEquipmentHistoryData(HistoryParamDayDto historyParamDayDto){
         List<Map<String, Object>> historyList = new ArrayList<>();
         List<Collectdata> orgDataList = new ArrayList<>();

module_tpm/src/main/java/org/jeecg/modules/healthStatistics/service/IHealthStatisticsService.java

@@ -7,9 +7,16 @@ import org.jeecg.common.api.vo.Result;
  */
 public interface IHealthStatisticsService {
     /**
-     *
+     * 健康概况信息获取
      * @param day
      * @return
      */
     public Result DashboardStatistics(String day);
+
+    /**
+     * 故障数据获取
+     * @param day
+     * @return
+     */
+    public Result healthDiagnosis(String day);
 }

module_tpm/src/main/java/org/jeecg/modules/healthStatistics/service/Impl/HealthStatisticsServiceImpl.java

@@ -143,4 +143,14 @@ public class HealthStatisticsServiceImpl implements IHealthStatisticsService {
 
         return Result.OK(map);
     }
+
+    /**
+     * 故障数据获取
+     * @param alarmid
+     * @return
+     */
+    @Override
+    public Result healthDiagnosis(String alarmid) {
+        return Result.OK();
+    }
 }

module_tpm/src/main/java/org/jeecg/modules/tpmparams/entity/TpmParams.java

@@ -29,7 +29,7 @@ public class TpmParams implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
     /**设备名称*/