diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java index 48890445..589c05a9 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java @@ -37,7 +37,7 @@ import java.util.Map; @Validated @Controller @RequestMapping(value = "/api") -@Api(description = "登录接口") +@Api(tags = "登录接口") @Slf4j public class LoginRestController { diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 0280f9bd..d89ffe27 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,7 +3,7 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://192.168.10.47:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root spring.datasource.password = root diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/controller/SarStandIssueControlCauseController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/controller/SarStandIssueControlCauseController.java index 3ad6a625..83ed19c1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/controller/SarStandIssueControlCauseController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/controller/SarStandIssueControlCauseController.java @@ -40,7 +40,7 @@ import java.util.List; */ @RestController @Api(tags = "|重点问题项管控模块-事业部|") -@RequestMapping("/sarStandIssueControlCause/sar-stand-issue-control-cause") +@RequestMapping("/api/sarStandIssueControlCause/sar-stand-issue-control-cause") public class SarStandIssueControlCauseController extends BaseController { private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/entity/SarStandIssueControlCause.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/entity/SarStandIssueControlCause.java index 4e10aa51..a0b2ad88 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/entity/SarStandIssueControlCause.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/entity/SarStandIssueControlCause.java @@ -10,11 +10,13 @@ import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; +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.springframework.format.annotation.DateTimeFormat; /** *

@@ -44,21 +46,27 @@ public class SarStandIssueControlCause extends BaseEntity { @ExcelProperty(value = "创建时间",converter = TimestampConverter.class) @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("CREATE_TIME") private Timestamp createTime; - @ExcelProperty("关闭状态") + @ExcelIgnore @ApiModelProperty(value = "关闭状态(1为开启,2为关闭)") @TableField("CLOSE_STATE") private Integer closeState; @ExcelIgnore @ApiModelProperty(value = "实际关闭时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("ACTUAL_CLOSE_TIME") private Timestamp actualCloseTime; @ExcelProperty(value = "要求关闭时间",converter = TimestampConverter.class) @ApiModelProperty(value = "要求关闭时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("REQUIRE_CLOSE_TIME") private Timestamp requireCloseTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/service/impl/SarStandIssueControlCauseServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/service/impl/SarStandIssueControlCauseServiceImpl.java index 3f2b3fe6..26c30a92 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/service/impl/SarStandIssueControlCauseServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlCause/service/impl/SarStandIssueControlCauseServiceImpl.java @@ -44,7 +44,7 @@ public class SarStandIssueControlCauseServiceImpl extends ServiceImpl { private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/entity/SarStandIssueControlProduct.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/entity/SarStandIssueControlProduct.java index f5591fd3..ca929c35 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/entity/SarStandIssueControlProduct.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/entity/SarStandIssueControlProduct.java @@ -10,11 +10,13 @@ import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; +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.springframework.format.annotation.DateTimeFormat; /** *

@@ -44,6 +46,8 @@ public class SarStandIssueControlProduct extends BaseEntity { @ExcelProperty(value = "创建时间",converter = TimestampConverter.class) @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("CREATE_TIME") private Timestamp createTime; @@ -54,11 +58,15 @@ public class SarStandIssueControlProduct extends BaseEntity { @ExcelIgnore @ApiModelProperty(value = "实际关闭时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("ACTUAL_CLOSE_TIME") private Timestamp actualCloseTime; @ExcelProperty(value = "要求关闭时间",converter = TimestampConverter.class) @ApiModelProperty(value = "要求关闭时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("REQUIRE_CLOSE_TIME") private Timestamp requireCloseTime; @@ -94,6 +102,8 @@ public class SarStandIssueControlProduct extends BaseEntity { @ExcelProperty(value = "实施时间",converter = TimestampConverter.class) @ApiModelProperty(value = "实施时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("IMPLEMENT_TIME") private Timestamp implementTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/service/impl/SarStandIssueControlProductServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/service/impl/SarStandIssueControlProductServiceImpl.java index 840c6fed..55701ecc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/service/impl/SarStandIssueControlProductServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIssueControlProduct/service/impl/SarStandIssueControlProductServiceImpl.java @@ -42,7 +42,7 @@ public class SarStandIssueControlProductServiceImpl extends ServiceImpl { private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoController.class); @@ -86,7 +86,7 @@ public class SarStandUnqualifiedController extends BaseController> closeSarStandUnqualified(@RequestBody StandUnqualifiedListVO standUnqualifiedListVO){ + public ResponseMessage> closeSarStandUnqualified(StandUnqualifiedListVO standUnqualifiedListVO){ if(standUnqualifiedListVO==null||standUnqualifiedListVO.getIds().size()==0){ return Result.error(ResponseMessageCodeEnum.ERROR.getCode(),"未传入未符合项ID",null); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index 69c8650f..17781e2e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -10,11 +10,13 @@ import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; +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.springframework.format.annotation.DateTimeFormat; /** *

@@ -44,6 +46,8 @@ public class SarStandUnqualified extends BaseEntity { @ExcelProperty(value = "创建时间",converter = TimestampConverter.class) @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("CREATE_TIME") private Timestamp createTime; @@ -54,11 +58,15 @@ public class SarStandUnqualified extends BaseEntity { @ExcelIgnore @ApiModelProperty(value = "实际关闭时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("ACTUAL_CLOSE_TIME") private Timestamp actualCloseTime; @ExcelProperty(value = "计划关闭时间",converter = TimestampConverter.class) @ApiModelProperty(value = "计划关闭时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("PLAN_CLOSE_TIME") private Timestamp planCloseTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index eefa6161..e457319a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -44,7 +44,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl