1.App警情反馈接口调整 2.租户接口新增

tangzy

2021-04-25 a4ff2b571be305e2641c9dd67797f4102e795ebb

1.App警情反馈接口调整
2.租户接口新增

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java

@@ -140,6 +140,7 @@

    /**
     * 图片上传
     *
     * @param file
     * @return
     * @throws IOException
@@ -176,7 +177,6 @@
    }



    @PostMapping("/insertfeed")
    public R insertfeed(String jid, String snumber, String sname, String addvcd, String place,
                        String result, String describe, String type, String devicenumber, String galarmpeople,
@@ -191,6 +191,7 @@

    /**
     * 查询
     *
     * @param response
     * @return
     */
@@ -205,6 +206,7 @@

    /**
     * 删除
     *
     * @return
     */
    @PostMapping("/deletefeed")
@@ -228,6 +230,7 @@

    /**
     * APP警情反馈信息
     *
     * @param response
     * @return
     */
@@ -250,8 +253,7 @@
            String substring = addr.substring(addr.length() - 4, addr.length());
            if (substring.equals(".mp4")){
                arlistm.add(addr);
            }
            else if (substring.equals(".jpg")){
            } else if (substring.equals(".jpg")) {
                arlistj.add(addr);
            }
        }
@@ -285,6 +287,9 @@

        feedbackService.save(feedback);
        Wj wj = new Wj();
        if (feedback.getSpaddress().equals("")&&feedback.getSpaddress().equals(null)) {

        } else {
        //获取视频地址
        String[] splitsp = feedback.getSpaddress().split(",");//以逗号分割
        for (String string2 : splitsp) {
@@ -292,12 +297,19 @@
            wj.setAddress(string2);
            iWjService.insertfeed(wj);
        }
        }
        if (feedback.getTpaddress().equals("")&&feedback.getTpaddress().equals(null)){

        }
        else {
        String[] splittp = feedback.getTpaddress().split(",");//以逗号分割
        for (String string3 : splittp) {
            for (
                String string3 : splittp) {
            wj.setJid(feedback.getJid());
            wj.setAddress(string3);
            iWjService.insertfeed(wj);
        }
        }
        alarmService.updateJtype(operation.getJid(),"2",null,null);

        return R.success("新增成功");

 blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java

@@ -294,4 +294,44 @@
        return R.success("删除成功");
    }



    @PostMapping("/selectList")
    public R selectList(String type) {
        List<Map<String, Object>> list = tenantService.selectList(type);
        for (int i=0;i<list.size();i++){
            //医院
            if (list.get(i).get("type").equals("0")){
                Object tenant_name = list.get(i).get("tenant_name");
                String hn= tenant_name.toString();
                List<Map<String, Object>> maps = tenantService.selectTy(hn);
                list.get(i).put("dj",maps.get(0).get("dj"));
                list.get(i).put("ht",maps.get(0).get("ht"));
                list.get(i).put("ctime",maps.get(0).get("ctime"));
                list.get(i).put("content",maps.get(0).get("content"));
            }
            //学校
            else if (list.get(i).get("type").equals("1")){
                Object tenant_name = list.get(i).get("tenant_name");
                String hn= tenant_name.toString();
                List<Map<String, Object>> maps = tenantService.selectTs(hn);
                list.get(i).put("nature",maps.get(0).get("nature"));
                list.get(i).put("motto",maps.get(0).get("motto"));
                list.get(i).put("ctime",maps.get(0).get("ctime"));
                list.get(i).put("content",maps.get(0).get("content"));
            }
            //小区
            else if (list.get(i).get("type").equals("2")){
                Object tenant_name = list.get(i).get("tenant_name");
                String hn= tenant_name.toString();
                List<Map<String, Object>> maps = tenantService.selectTr(hn);
                list.get(i).put("category",maps.get(0).get("category"));
                list.get(i).put("attributes",maps.get(0).get("attributes"));
                list.get(i).put("developers",maps.get(0).get("developers"));
                list.get(i).put("housetype",maps.get(0).get("housetype"));
                list.get(i).put("content",maps.get(0).get("content"));
            }
        }
        return R.data(list);
    }
}

 blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.java

@@ -38,6 +38,7 @@
     * @return
     */
    List<Tenant> selectTenantPage(IPage page, Tenant tenant);
    List<Map<String, Object>> selectList(String type);
    int inserts(String dj, String had, String ht, String ctime,String content,String hn);
    void updateInfoy(String dj, String had, String ht, String ctime,String content,String hn);
    List<Map<String, Object>> selectTy(String hn);

 blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml

@@ -100,4 +100,12 @@
    <delete id="deleter">
        delete from jfpt.sys_residential where hn = #{hn}
    </delete>


    <select id="selectList" resultType="java.util.HashMap">
        select * from blade_tenant where is_deleted = 0 and tenant_id!=000000
        <if test="type!=null and type!=''">
            and tenant.type=#{tenant.type}
        </if>
    </select>
</mapper>

 blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java

@@ -85,4 +85,5 @@
    void deletey(String hn);
    void deletes(String hn);
    void deleter(String hn);
    List<Map<String, Object>> selectList(String type);
}

 blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java

@@ -253,6 +253,11 @@
 baseMapper.deleter(hn);
    }

    @Override
    public List<Map<String, Object>> selectList(String type) {
        return baseMapper.selectList(type);
    }

    private String getTenantId(List<String> codes) {
        String code = tenantId.generate();
        if (codes.contains(code)) {