Merge remote-tracking branch 'origin/master'

Administrator

2021-03-12 a5b6b004f1737bf06aaaeb8d06e40b9702de25e5

Merge remote-tracking branch 'origin/master'

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

@@ -41,6 +41,7 @@
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;

@@ -221,4 +222,18 @@
        return R.success("删除成功");
    }

    /**
     * APP警情反馈信息
     * @param response
     * @return
     */
    @PostMapping("/selectFeedEdit")
    public R selectFeedEdit(HttpServletResponse response,String jid) {
        response.setHeader("Access-Control-Allow-Origin", "*");
        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
        response.setHeader("Access-Control-Allow-Credentials","true");
        List<FeedbackVO> feedbackVOS = feedbackService.selectFeedEdit(jid);
        return R.data(feedbackVOS);
    }

}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.java

@@ -40,6 +40,7 @@
     */
    List<FeedbackVO> selectFeedbackPage(IPage page, FeedbackVO feedback);
    List<FeedbackVO> selectFeedList();
    List<FeedbackVO> selectFeedEdit(String jid);
    void insertfeed(String jid, String snumber, String sname, String addvcd, String place, String result, String describe, String type, String devicenumber, String galarmpeople, String phone, String stime,
                    String ctime, String feedbackaudio, String feedbackvideo, String feedbackphoto, String jd, String wd, String tname);
}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/mapper/FeedbackMapper.xml

@@ -57,4 +57,14 @@
    <select id="selectFeedList" resultMap="feedbackResultMaps">
           select f.*,d.addvnm from sys_feedback f left join sys_district d on d.addvcd=f.addvcd
    </select>

    <!--App警情反馈信息-->
    <select id="selectFeedEdit" resultMap="feedbackResultMaps">
        SELECT
            f.*,
            w.address
        FROM
            sys_feedback f
                LEFT JOIN sys_wj w ON w.jid = f.jid WHERE f.jid=#{jid}
    </select>
</mapper>

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

@@ -42,4 +42,5 @@
    void insertfeed(String jid, String snumber, String sname, String addvcd, String place, String result, String describe, String type, String devicenumber, String galarmpeople, String phone, String stime,
                    String ctime, String feedbackaudio, String feedbackvideo, String feedbackphoto, String jd, String wd, String tname);
    List<FeedbackVO> selectFeedList();
    List<FeedbackVO> selectFeedEdit(String jid);
}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/service/impl/FeedbackServiceImpl.java

@@ -51,5 +51,10 @@
        return baseMapper.selectFeedList();
    }

    @Override
    public List<FeedbackVO> selectFeedEdit(String jid) {
        return baseMapper.selectFeedEdit(jid);
    }


}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/vo/FeedbackVO.java

@@ -34,5 +34,6 @@
    private static final long serialVersionUID = 1L;

    private  String addvnm;
    private  String address;

}