问题修复

zengh

2022-02-22 6d1c495c50d6e1ed6044ed28be3f76e7d536b77a

问题修复

 src/main/java/org/springblade/modules/system/entity/User.java

@@ -135,4 +135,9 @@
     */
    private String stype;

    /**
     * 地址
     */
    private String address;

}

 src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java

@@ -261,12 +261,13 @@
    }

    @GetMapping("/startTask")
    public R<Map> startTask(String rid, String serid,String type) {
    public R<Map> startTask(String rid, String serid,String type,String data) {
        //获取组员id并进行通知
        Map<String, Object> map = new HashMap<>();
        int msg = pushMsgService.startTask(serid, rid,type);
        map.put("res", msg);
        map.put("type", type);
        map.put("data",data);
        taskqdService.updateRtype("0",rid);
        return R.data(map);
    }

 src/main/java/org/springblade/modules/webscoket/WebSocketHandler.java

@@ -105,8 +105,8 @@
                String id = jsonObj.get("id").toString();
                NettyConfig.getUserChannelMap().put(id,ctx.channel());

                System.out.println(jsonObj.get("type"));
                System.out.println(jsonObj.get("id"));
                System.out.println("___________________"+jsonObj.get("type"));
                System.out.println(jsonObj.get("id")+ "____________________________用户连接成功");

                //将用户id作为自定义属性加入到channel 中，方便随时channel中获取用户id
                AttributeKey<String> key = AttributeKey.valueOf("userId");

 src/main/java/org/springblade/modules/zc/controller/ZcController.java

@@ -223,8 +223,9 @@
        user.setExamination_mx("正常");
        user.setCardid(zc.getCardid());
        user.setStype("0");
        user.setAddress(zc.getAddress());
        iUserService.saveOrUpdate(user);
        String s = "insert into act_zc(id,username,password,sname,sex,phone,zctime,deptid,parent_id,jurisdiction,cardid)" +
        String s = "insert into act_zc(id,username,password,sname,sex,phone,zctime,deptid,parent_id,jurisdiction,cardid,address)" +
            "values(" + "'" + zc.getId() + "'" +
            "," + "'" + zc.getUsername() + "'" +
            "," + "'" + zc.getPassword() + "'" +
@@ -235,7 +236,9 @@
            "," + "'" + zc.getDeptid() + "'" +
            "," + "'" + zc.getParentId() + "'" +
            "," + "'" + zc.getJurisdiction() + "'" +
            "," + "'" + zc.getCardid() + "'" + ")";
            "," + "'" + zc.getCardid() + "'" +
            "," + "'" + zc.getAddress() + "'"
            + ")";
        FtpUtil.sqlFileUpload(s);
        return R.success("新增成功");
    }

 src/main/java/org/springblade/modules/zc/entity/Zc.java

@@ -114,4 +114,6 @@
    @TableField("audit_time")
    private Date auditTime;

    private String address;

}

 src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml

@@ -19,6 +19,7 @@
        <result column="examination_type" property="examination_type"/>
        <result column="examination_mx" property="examination_mx"/>
        <result column="audit_time" property="auditTime"/>
        <result column="address" property="address"/>
    </resultMap>


@@ -49,9 +50,9 @@

    <!--注册新增-->
    <insert id="inster" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
        insert into act_zc(username, password, sname, sex, phone, zctime, deptid, parent_id, jurisdiction, cardid)
        insert into act_zc(username, password, sname, sex, phone, zctime, deptid, parent_id, jurisdiction, cardid,address)
        values (#{username}, #{password}, #{sname}, #{sex}, #{phone}, #{zctime}, #{deptid}, #{parentId},
                #{jurisdiction}, #{cardid})
                #{jurisdiction}, #{cardid},#{address})
    </insert>

    <select id="selectType" resultType="String">