合并

李宇

2021-01-27 d6c65a4e3d1ca7d9a7bd6806c99fee035d0a44eb

 src/main/java/com/nanometer/smartlab/api/ApiAction.java

@@ -1576,7 +1576,7 @@
     */
    @ResponseBody
    @RequestMapping("hazardousWaste/getWasteInfo")
    public Object getLabAndUser(@RequestParam(required=true) int adminFlag,@RequestParam(required=true) String name,@RequestParam(required=false) String status
    public Object getWasteInfo(@RequestParam(required=true) int adminFlag,@RequestParam(required=true) String name,@RequestParam(required=false) String status
    ,@RequestParam(required=false) String starttime,@RequestParam(required=false) String endtime){
        try {
            if (StringUtils.isBlank(name)){
@@ -1601,7 +1601,7 @@
     */
    @ResponseBody
    @RequestMapping("hazardousWaste/changeStatus")
    public Object getLabAndUser(@RequestParam(required=true) String tid,@RequestParam(required=true) String status,
    public Object changeStatus(@RequestParam(required=true) String tid,@RequestParam(required=true) String status,
                                @RequestParam(required=true) String updator){
        try {
            if (StringUtils.isBlank(tid) || StringUtils.isBlank(status)){
@@ -1688,4 +1688,69 @@
    }


    /**
     * 根据用户名获取危废全年统计列表
     *
     */
    @ResponseBody
    @RequestMapping("hazardousWaste/getWasteStatistics")
    public Object getWasteStatistics(@RequestParam(required=true) int adminFlag,@RequestParam(required=true) String name){
        try {
            if (StringUtils.isBlank(name)){
                return  ResponseModel.getErrInstance("姓名不能为空");
            }
            Calendar calendar = Calendar.getInstance();
            int year = calendar.get(Calendar.YEAR);
            String status = "已确认";
            String starttime = year+"-01-01 00:00:00";
            String endtime = year+"-12-31 23:59:59";
            List<HazardousWaste> hazardousWasters = new ArrayList<>();
            if (adminFlag == 2){
                hazardousWasters = hazardousWasteService.setAllWasterCount(starttime,endtime,status,null);
            }else if (adminFlag == 1) {
                hazardousWasters = hazardousWasteService.setAllWasterCount(starttime,endtime,status,name);
            }
            return ResponseModel.getOkInstence(hazardousWasters);
        }catch (Exception e){
            e.printStackTrace();
            logger.info(e);
            return ResponseModel.getErrInstance("系统出错");
        }
    }

    // 处理人员违规预警接口
    @ResponseBody
    @RequestMapping(value = "/delalarmperson")
    public String delalarmperson(HttpServletRequest request) throws IOException {
        logger.info("/api/service/delalarmperson");
        BufferedReader br = request.getReader();
        String str, data = "";
        while((str = br.readLine()) != null){
            data += str;
        }
        logger.info("delalarmperson" + data);
//        String userId = request.getHeader("userId");
        JSONObject retJSON = new JSONObject();
        try {
            interfaceService.delalarmperson(JSONObject.parseObject(data));

            retJSON.put("code", ApiStatus.OK.getRetCode());
            retJSON.put("message", ApiStatus.OK.getRetMsg());
        } catch (ApiException e) {
            retJSON.put("code", e.getApiStatus().getRetCode());
            retJSON.put("message", e.getErrorMessage());
        } catch (Exception e) {
            retJSON.put("code", ApiStatus.SYS_ERR.getRetCode());
            StackTraceElement[] stackTraceElements = e.getStackTrace();

            StringBuilder sb = new StringBuilder();
            sb.append(e.toString());
            for (StackTraceElement stackTraceElement : stackTraceElements) {
                sb.append("\n");
                sb.append(stackTraceElement.toString());
            }
            retJSON.put("message", ApiStatus.SYS_ERR.getRetMsg() + "--" + sb.toString());
        }
        return retJSON.toJSONString();
    }
}