diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java index 39e3fd6..47c7365 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/OADistributionMapper.java @@ -33,4 +33,6 @@ public interface OADistributionMapper extends BaseMapper { /*修改任务读取状态*/ Integer changeStatus(@Param("taskId") String taskId,@Param("sysUserId") String sysUserId); + + List taskList(@Param("condition")String condition); } diff --git a/inventory-dao/src/main/java/com/rzyc/model/task/dto/AddTaskDto.java b/inventory-dao/src/main/java/com/rzyc/model/task/dto/AddTaskDto.java index 783d46c..8e7fdba 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/task/dto/AddTaskDto.java +++ b/inventory-dao/src/main/java/com/rzyc/model/task/dto/AddTaskDto.java @@ -34,9 +34,6 @@ public class AddTaskDto { @TableField("SysUserId") private String sysuserid; - @ApiModelProperty(value = "中文名") - @TableField("SysChinaName") - private String syschinaname; /** * 接收人名 @@ -44,10 +41,6 @@ public class AddTaskDto { @ApiModelProperty(value = "接收人名") private String receiveName; - @ApiModelProperty(value = "接收用户电话") - @TableField("SysTelephone") - private String systelephone; - @ApiModelProperty(value = "任务摘要") @TableField("title") private String title; @@ -56,13 +49,13 @@ public class AddTaskDto { @TableField("subject") private String subject; - @ApiModelProperty(value = "开始时间,格式 yyyy-MM-dd HH:mm:ss",required = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss", iso = DateTimeFormat.ISO.DATE_TIME) + @ApiModelProperty(value = "开始时间,格式 yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("start_time") private Date startTime; - @ApiModelProperty(value = "结束时间,格式 yyyy-MM-dd HH:mm:ss",required = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss", iso = DateTimeFormat.ISO.DATE_TIME) + @ApiModelProperty(value = "结束时间,格式 yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("end_time") private Date endTime; @@ -104,14 +97,6 @@ public class AddTaskDto { this.sysuserid = sysuserid; } - public String getSyschinaname() { - return syschinaname; - } - - public void setSyschinaname(String syschinaname) { - this.syschinaname = syschinaname; - } - public String getReceiveName() { return receiveName; } @@ -120,14 +105,6 @@ public class AddTaskDto { this.receiveName = receiveName; } - public String getSystelephone() { - return systelephone; - } - - public void setSystelephone(String systelephone) { - this.systelephone = systelephone; - } - public String getTitle() { return title; } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java index cd90ec9..b0f4916 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java @@ -75,6 +75,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { SysUser sysUser = sysUserMapper.findBySysUserName(sysusername); if(null != sysUser && StringUtils.isNotBlank(sysUser.getUsertype()) && sysUser.getUsertype().equals("政府用户")){ String ps = PasswdFactory.encryptPasswd(sysUser.getSysuserid(), sysusername, syspassword); + System.out.println("========" + ps); if(sysUser.getSyspassword().equals(ps)){ sysUser.setSyspassword(""); diff --git a/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java b/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java index 6654271..c17f14c 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/TaskController.java @@ -11,6 +11,8 @@ import com.rzyc.model.user.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.beanutils.ConvertUtils; +import org.apache.commons.beanutils.converters.DateConverter; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; @@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Date; +import java.util.List; /** * @ClassName: TaskController @@ -45,6 +48,9 @@ public class TaskController extends BaseController{ SingleResult result = new SingleResult<>(); OADistribution oaDistribution = new OADistribution(); BeanUtils.copyProperties(oaDistribution,addTaskDto); + //日期格式转换 + ConvertUtils.register(new DateConverter(null), java.util.Date.class); + SysUser sysUser = sysUserMapper.selectByPrimaryKey(addTaskDto.getSysuserid()); if(null == sysUser){ result.setCode(0); @@ -58,6 +64,7 @@ public class TaskController extends BaseController{ oaDistribution.setSystelephone(sysUser.getMobiletel()); oaDistribution.setCreatedby(getChinaName()); oaDistribution.setCreatedon(new Date()); + oaDistributionMapper.insert(oaDistribution); } return result; @@ -68,7 +75,9 @@ public class TaskController extends BaseController{ * @Author: ZQW * @Date: 2022/9/20 */ - /*public MultiResult taskList(){ - - }*/ + public MultiResult taskList(){ + MultiResult result = new MultiResult<>(); + List oaDistributions = oaDistributionMapper.taskList("%%"); + return result; + } } diff --git a/inventory-gov/src/main/resources/application-dev.yml b/inventory-gov/src/main/resources/application-dev.yml index 7254470..746cded 100644 --- a/inventory-gov/src/main/resources/application-dev.yml +++ b/inventory-gov/src/main/resources/application-dev.yml @@ -90,6 +90,8 @@ onstants: word_tmp: /mnt/rzyc/resource/inventory/wordtmp + + #加密 jasypt: encryptor: