diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/controller/SarUpdLogController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/controller/SarUpdLogController.java index 712e6768..c0d55b20 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/controller/SarUpdLogController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/controller/SarUpdLogController.java @@ -1,12 +1,21 @@ package com.adc.da.slrs.sarUpdLog.controller; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarUpdLog.entity.SarUpdLogEOPage; +import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import com.adc.da.slrs.sarUpdLog.entity.SarUpdLog; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; +import java.util.List; + /** *

* 前端控制器 @@ -17,7 +26,16 @@ import com.adc.da.base.web.BaseController; */ @RestController @Api(description = "|SarUpdLog|") -@RequestMapping("/SarUpdLog/sar-upd-log") +@RequestMapping("/${restPath}/lawss/sarUpdLog") public class SarUpdLogController extends BaseController { + @Autowired + private ISarUpdLogService iSarUpdLogService; + + @ApiOperation(value = "|SarUpdLogEO|查询") + @GetMapping("/getLogList") + public ResponseMessage> list(SarUpdLogEOPage page) throws Exception { + page.setOrderBy("SAR_UPD_LOG.creation_time desc,id"); + return Result.success(iSarUpdLogService.queryByList(page)); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/dao/SarUpdLogDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/dao/SarUpdLogDao.java index 4b6afaac..2243731c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/dao/SarUpdLogDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/dao/SarUpdLogDao.java @@ -1,8 +1,11 @@ package com.adc.da.slrs.sarUpdLog.dao; import com.adc.da.slrs.sarUpdLog.entity.SarUpdLog; +import com.adc.da.slrs.sarUpdLog.entity.SarUpdLogEOPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; + /** *

* Mapper 接口 @@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface SarUpdLogDao extends BaseMapper { + List queryByList(SarUpdLogEOPage page); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/entity/SarUpdLog.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/entity/SarUpdLog.java index 0973cdbf..02a6cc82 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/entity/SarUpdLog.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/entity/SarUpdLog.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import java.util.Date; 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; @@ -45,10 +46,13 @@ public class SarUpdLog extends BaseEntity { @ApiModelProperty(value = "创建时间") @TableField("CREATION_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date creationTime; @TableField("CREATION_USER") private String creationUser; - + @ApiModelProperty(value = "创建用户名称") + @TableField(exist = false) + private String creationUserName; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/entity/SarUpdLogEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/entity/SarUpdLogEOPage.java new file mode 100644 index 00000000..0e42089c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/entity/SarUpdLogEOPage.java @@ -0,0 +1,122 @@ +package com.adc.da.slrs.sarUpdLog.entity; + +import com.adc.da.base.page.BasePage; + +/** + * 功能:SAR_UPD_LOG SarUpdLogEOPage
+ * 作者:code generator
+ * 日期: 2020-12-08
+ * 版权所有:版权归北京卡达克数据技术中心所有。
+ */ +public class SarUpdLogEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String sarType; + private String sarTypeOperator = "="; + private String sarId; + private String sarIdOperator = "="; + private String content; + private String contentOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getSarType() { + return this.sarType; + } + + public void setSarType(String sarType) { + this.sarType = sarType; + } + + public String getSarTypeOperator() { + return this.sarTypeOperator; + } + + public void setSarTypeOperator(String sarTypeOperator) { + this.sarTypeOperator = sarTypeOperator; + } + + public String getSarId() { + return this.sarId; + } + + public void setSarId(String sarId) { + this.sarId = sarId; + } + + public String getSarIdOperator() { + return this.sarIdOperator; + } + + public void setSarIdOperator(String sarIdOperator) { + this.sarIdOperator = sarIdOperator; + } + + public String getContent() { + return this.content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getContentOperator() { + return this.contentOperator; + } + + public void setContentOperator(String contentOperator) { + this.contentOperator = contentOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/ISarUpdLogService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/ISarUpdLogService.java index 9e18ccde..ddb181f1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/ISarUpdLogService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/ISarUpdLogService.java @@ -1,8 +1,10 @@ package com.adc.da.slrs.sarUpdLog.service; import com.adc.da.slrs.sarUpdLog.entity.SarUpdLog; +import com.adc.da.slrs.sarUpdLog.entity.SarUpdLogEOPage; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; import java.util.Map; /** @@ -15,6 +17,8 @@ import java.util.Map; */ public interface ISarUpdLogService extends IService { + List queryByList(SarUpdLogEOPage page); + void createBaseLog(String sarId, String sarType, String content) throws Exception; void createUpdateLog(String sarType, String sarId, Map oldMap, Map newMap, String standContent) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java index 4525855c..4e979cfd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java @@ -4,6 +4,7 @@ import com.adc.da.common.SarTypeEnum; import com.adc.da.slrs.sarStandAttrDetails.dao.SarStandAttrDetailsDao; import com.adc.da.slrs.sarUpdLog.entity.SarUpdLog; import com.adc.da.slrs.sarUpdLog.dao.SarUpdLogDao; +import com.adc.da.slrs.sarUpdLog.entity.SarUpdLogEOPage; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.util.LoginUserUtil; @@ -48,6 +49,11 @@ public class SarUpdLogServiceImpl extends ServiceImpl i private List notCheckFieldList = Arrays.asList(notCheckField.split(",")); + @Override + public List queryByList(SarUpdLogEOPage page){ + return dao.queryByList(page); + } + public void createUpdateLog (String sarType, String sarId, Map oldMap, Map newMap,String standContent) throws Exception { SarUpdLog sarUpdLogEO = new SarUpdLog(); sarUpdLogEO.setId(UUIDUtils.randomUUID20()); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarUpdLog/SarUpdLogMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarUpdLog/SarUpdLogMapper.xml index a4bab2be..93b7040c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarUpdLog/SarUpdLogMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarUpdLog/SarUpdLogMapper.xml @@ -1,5 +1,155 @@ + + + + + + + + + + + + + SAR_UPD_LOG.id, sar_type, sar_id, content, SAR_UPD_LOG.creation_time,SAR_UPD_LOG.creation_user + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and sar_type ${sarTypeOperator} #{sarType} + + + and sar_id ${sarIdOperator} #{sarId} + + + and content ${contentOperator} #{content} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + + + + + + insert into SAR_UPD_LOG() + values (#{id, jdbcType=VARCHAR}, #{sarType, jdbcType=VARCHAR}, #{sarId, jdbcType=VARCHAR}, #{content, jdbcType=CLOB}, #{creationTime, jdbcType=TIMESTAMP}) + + + + + + insert into SAR_UPD_LOG + + id, + sar_type, + sar_id, + content, + creation_time, + creation_user, + + + #{id, jdbcType=VARCHAR}, + #{sarType, jdbcType=VARCHAR}, + #{sarId, jdbcType=VARCHAR}, + #{content, jdbcType=CLOB}, + #{creationTime, jdbcType=TIMESTAMP}, + #{creationUser, jdbcType=VARCHAR}, + + + + + + update SAR_UPD_LOG + set sar_type = #{sarType}, + sar_id = #{sarId}, + content = #{content}, + creation_time = #{creationTime} + where id = #{id} + + + + + update SAR_UPD_LOG + + + sar_type = #{sarType}, + + + sar_id = #{sarId}, + + + content = #{content}, + + + creation_time = #{creationTime}, + + + creation_user = #{creationUser}, + + + where id = #{id} + + + + + + + + delete from SAR_UPD_LOG + where id = #{value} + + + + + + + + + +