Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

zmk

2024-05-27 9166b7b4bdb84bfe499078dd68add5c3e462411f

 javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java

@@ -12,8 +12,10 @@
import com.javaweb.geo.domain.Hole;
import com.javaweb.geo.domain.HoleMedia;
import com.javaweb.geo.domain.Project;
import com.javaweb.geo.domain.TubLog;
import com.javaweb.geo.enums.RecordType;
import com.javaweb.geo.mapper.HoleMapper;
import com.javaweb.geo.mapper.TubLogMapper;
import com.javaweb.geo.service.IHoleMediaService;
import com.javaweb.geo.service.IHoleService;
import com.javaweb.geo.service.IProjectService;
@@ -60,6 +62,10 @@

    @Autowired
    private IHoleMediaService holeMediaService;

    @Autowired
    private TubLogMapper tubLogMapper;


    private String getAdminIndex() {
        return configService.selectConfigByKey(CmsConstants.KEY_ADMIN_INDEX);
@@ -164,13 +170,29 @@
                String ids = projects.get(i).getIds();
                Double val = holeMap.get(ids);
                vo = new ProjectProcessVO();

                vo.setIds(projects.get(i).getIds());
                vo.setRanking(i + 1);
                vo.setStation(projects.get(i).getCode());
                vo.setStation(projects.get(i).getFullName());
                vo.setValue(val);
                vo.setLng(projects.get(i).getLng());
                vo.setLat(projects.get(i).getLat());


                if (val == null) {
                    vo.setValue(0.0d);
                }
                vo.setStatus(projects.get(i).getStatus());
                String []statusName ={"协调中","待开工","进行中"};
                String status = projects.get(i).getStatus();
                if(status.equals("0")){
                    vo.setStatus(statusName[0]);
                }else if(status.equals("1")){
                    vo.setStatus(statusName[1]);
                }else if(status.equals("2")){
                    vo.setStatus(statusName[2]);
                }else{
                    vo.setStatus("未知");
                }
                vos.add(vo);
            }
        }
@@ -224,5 +246,17 @@
        return AjaxResult.success("查询成功",result);
    }

    /**
     * 统计材料的消耗
     * @return
     */
    @ResponseBody
    @GetMapping("/system/tubLogData")
    public AjaxResult tubLogData() {
        AjaxResult ajaxResult = new AjaxResult();
        List<TubLog> tubLogs = tubLogMapper.countTubLogDate();
        ajaxResult.put("tubLogs",tubLogs);
        return  ajaxResult;
    }

}