From 509712b5b56f64ea444af4d417cc900b17e3777d Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Mon, 23 Sep 2024 20:32:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=BF=E6=90=BA=E5=BC=8F=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E4=BF=A1=E6=81=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/njcn/csdevice/pojo/vo/CsDevModelPageVO.java | 4 ++-- .../csdevice/controller/equipment/CsSoftInfoController.java | 2 +- .../com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsDevModelPageVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsDevModelPageVO.java index b611d4e..c959141 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsDevModelPageVO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsDevModelPageVO.java @@ -48,8 +48,8 @@ public class CsDevModelPageVO extends BaseEntity { * 版本日期 */ @ApiModelProperty(value = "版本日期") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date versionDate; /** diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsSoftInfoController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsSoftInfoController.java index 31bb08d..10f8710 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsSoftInfoController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsSoftInfoController.java @@ -50,7 +50,7 @@ public class CsSoftInfoController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/saveSoftInfo") @ApiOperation("保存程序软件信息") - @ApiImplicitParam(name = "id", value = "id", required = true) + @ApiImplicitParam(name = "po", value = "po", required = true) public HttpResult saveSoftInfo(@RequestBody CsSoftInfoPO po){ String methodDescribe = getMethodDescribe("saveSoftInfo"); csSoftInfoService.save(po); diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java index 2a7bd03..0b0b0d7 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java @@ -116,6 +116,7 @@ public class CsLedgerServiceImpl extends ServiceImpl i for(CsLedgerVO cs : c.getChildren()){ cs.setPid(c.getId()); cs.setLevel(3); + cs.setComFlag(csEquipmentDeliveryPO.getRunStatus()); } } portable.setChildren(portables);