保存数据

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentDetail.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
 
 import io.swagger.annotations.ApiModel;
@@ -77,6 +78,8 @@ public class EquipmentDetail extends BaseEntity {
 	@ApiModelProperty(value = "保养周期")
 	private BigDecimal maintenanceCycle;
 
+
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	@TableField("update_date")
 	@ApiModelProperty(value = "更新时间")
 	private Date updateDate;
@@ -93,6 +96,7 @@ public class EquipmentDetail extends BaseEntity {
 	@ApiModelProperty(value = "合同编号")
 	private String contractCode;
 
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	@TableField("production_date")
 	@ApiModelProperty(value = "生产日期")
 	private Date productionDate;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java

@@ -39,6 +39,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -103,33 +104,40 @@ public class EquipmentDetailController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public EquipmentDate saveEquipmentDetail(@RequestBody EquipmentDate equipmentDate) {
-        if (equipmentDate.getEquipmentSpecific().getSingle() == null) {
-            throw new BadRequest("管理方式未输入");
-        }
-        EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
-        String sysCode = vo.getCode();
-        if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
-            int code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("code", sysCode.trim()));
-            if (code != 0 ) {
-                throw new BadRequest("设备编码填写重复，请重新输入！");
-            }
-        }
-        String iot = vo.getIotCode();
-        if (StringUtils.isNotEmpty(iot) && StringUtils.isNotEmpty(iot.trim())){
-            int iot_code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("iot_code", iot.trim()));
-            if (iot_code != 0 ) {
-                throw new BadRequest("物联编码填写重复，请重新输入！");
-            }
-        }
-        EquipmentDate date = equipmentSpecificSerivce.equipmentSpecificCreate(equipmentDate, getSelectedOrgInfo(), getUserInfo());
-        // TODO 后续判断成功，执行同步
-        Long equipmentId = date.getEquipmentDetail().getEquipmentId();
-        // 编辑同步redis装备iotcode数据
-        syncDataService.saveOrUpdateEquipIotCodeRedisData(null);
-        if (syncSwitch) {
-            equipmentSpecificSerivce.equipSpecificDataSync(date.getEquipmentSpecific().getId());
-        }
-        return date;
+//        DateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        simpleDateFormat.parse(String.valueOf(equipmentDate.getEquipmentDetail().getUpdateDate()));
+//        o.setAddTime(simpleDateFormat.parse(equipmentDate.getEquipmentDetail().getProductionDate())));
+        System.out.println("++++++++++++++++++++");
+        System.out.println(equipmentDate.getEquipmentDetail());
+        System.out.println(equipmentDate.getEquipmentDetail().getUpdateDate());
+        System.out.println(equipmentDate.getEquipmentSpecific());
+//        if (equipmentDate.getEquipmentSpecific().getSingle() == null) {
+//            throw new BadRequest("管理方式未输入");
+//        }
+//        EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
+//        String sysCode = vo.getCode();
+//        if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
+//            int code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("code", sysCode.trim()));
+//            if (code != 0 ) {
+//                throw new BadRequest("设备编码填写重复，请重新输入！");
+//            }
+//        }
+//        String iot = vo.getIotCode();
+//        if (StringUtils.isNotEmpty(iot) && StringUtils.isNotEmpty(iot.trim())){
+//            int iot_code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("iot_code", iot.trim()));
+//            if (iot_code != 0 ) {
+//                throw new BadRequest("物联编码填写重复，请重新输入！");
+//            }
+//        }
+//        EquipmentDate date = equipmentSpecificSerivce.equipmentSpecificCreate(equipmentDate, getSelectedOrgInfo(), getUserInfo());
+//        // TODO 后续判断成功，执行同步
+//        Long equipmentId = date.getEquipmentDetail().getEquipmentId();
+//        // 编辑同步redis装备iotcode数据
+//        syncDataService.saveOrUpdateEquipIotCodeRedisData(null);
+//        if (syncSwitch) {
+//            equipmentSpecificSerivce.equipSpecificDataSync(date.getEquipmentSpecific().getId());
+//        }
+        return equipmentDate;
     }
 
     /***