智慧保安后台管理-验收版本
tangzy
2021-09-14 16bcf961bb6bd616ce04bae7e6b999cdd7c146a3
1.用户
7 files modified
25 ■■■■■ changed files
src/main/java/org/springblade/common/constant/FtpConstant.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/controller/UserController.java 8 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/entity/User.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/mapper/UserMapper.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml 3 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/service/IUserService.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/common/constant/FtpConstant.java
@@ -48,6 +48,6 @@
    String MinioPath = "D:\\ftptp\\";
//    String jsonUrl = "/usr/local/minio/data/zhba/upload/picture";
    //    String jsonUrl = "/usr/local/minio/data/zhba/upload/picture";
    String jsonUrl = "D:\\anbao\\";
}
src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -54,7 +54,9 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -355,8 +357,10 @@
    @GetMapping("/updateUser")
    public R updateUser(String hold,String cardid) {
        userService.updateUser(hold, cardid);
    public R updateUser(String hold,String cardid,String holdv) {
        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
        String time = df.format(new Date());
        userService.updateUser(hold, cardid,holdv,time);
        return R.success("吊销成功");
    }
src/main/java/org/springblade/modules/system/entity/User.java
@@ -190,6 +190,10 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @TableField("paper_time")
    private Date paperTime;
    private String holdv;
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date holdvtime;
}
src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -65,7 +65,7 @@
     */
    List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);
    void updateUser(String hold,String cardid);
    void updateUser(String hold,String cardid,String holdv,String time);
    /**
     * 自定义用户列表(只有保安员)
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -45,6 +45,7 @@
        <result column="my_picture" property="myPicture"/>
        <result column="soil" property="soil"/>
        <result column="healstats" property="healstats"/>
        <result column="holdv" property="holdv"/>
    </resultMap>
@@ -286,7 +287,7 @@
    <update id="updateUser">
        update blade_user
        set hold=#{hold}
        set hold=#{hold},holdv=#{holdv},holdvtime=#{time}
        where cardid = #{cardid}
    </update>
src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -206,7 +206,7 @@
     * @return
     */
    UserVO platformDetail(User user);
    void updateUser(String hold,String cardid);
    void updateUser(String hold,String cardid,String holdv,String time);
    /**
     * 自定义用户列表(只有保安员)
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -423,8 +423,8 @@
    }
    @Override
    public void updateUser(String hold, String cardid) {
        baseMapper.updateUser(hold, cardid);
    public void updateUser(String hold, String cardid,String holdv,String time) {
        baseMapper.updateUser(hold, cardid,holdv,time);
    }