javaweb-plus/javaweb-admin/src/main/resources/application-druid.yml
@@ -6,12 +6,12 @@ druid: # 主库数据源 master: #url: jdbc:mysql://localhost:3306/jianguan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 #username: root #password: 123456 url: jdbc:mysql://117.78.1.188:8979/jianguan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://localhost:3306/chenjiang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: 0a6a0fca362f482bb42950be47237946Aa@ password: 123456 # url: jdbc:mysql://117.78.1.188:8979/jianguan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: root # password: 0a6a0fca362f482bb42950be47237946Aa@ # 从库数据源 slave: # 从数据源开关/默认关闭 javaweb-plus/javaweb-admin/src/main/resources/application.yml
@@ -7,7 +7,7 @@ # 版权年份 copyrightYear: 2022 # 实例演示开关 demoEnabled: false demoEnabled: true # 文件路径 示例 profile: D:\dkyWeb\uploads # 获取ip地址开关 javaweb-plus/javaweb-admin/src/main/resources/templates/index.html
@@ -4,7 +4,7 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="renderer" content="webkit"> <title>勘察信息化服务平台</title> <title>钻探工程信息化系统</title> <!--[if lt IE 9]> <meta http-equiv="refresh" content="0;ie.html"/> <![endif]--> @@ -29,7 +29,7 @@ <ul class="nav" id="side-menu"> <a th:href="@{/index}"> <li class="logo"> <span class="logo-lg" >监管平台</span> <span class="logo-lg" >钻探工程平台</span> </li> </a> <li> javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/CollectStatisticsController.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/CompanyController.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/CompanyUserController.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DataSourceController.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ExceptionConfigController.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ExceptionController.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/LaborUnitController.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectController.java
@@ -4,7 +4,6 @@ import com.javaweb.geo.domain.CompanyUser; import com.javaweb.geo.mapper.HoleMapper; import com.javaweb.geo.vo.ExceptionProjectVo; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -20,8 +19,6 @@ import com.javaweb.common.enums.BusinessType; import com.javaweb.geo.domain.Company; import com.javaweb.geo.domain.Project; import com.javaweb.geo.mapper.CompanyMapper; import com.javaweb.geo.mapper.CompanyUserMapper; import com.javaweb.geo.service.IProjectService; import com.javaweb.common.core.controller.BaseController; import com.javaweb.common.core.domain.AjaxResult; @@ -42,12 +39,6 @@ @Autowired private IProjectService projectService; @Autowired private CompanyMapper companyMapper; @Autowired private CompanyUserMapper companyUserMapper; @Autowired private HoleMapper holeMapper; @@ -118,15 +109,6 @@ String cname = ""; String lname = ""; CompanyUser companyUser = companyUserMapper.selectCompanyUserById(project.getLeader()); Company company = companyMapper.selectCompanyById(project.getCompanyId()); if (!ObjectUtils.isEmpty(company)){ cname = company.getFullName(); } if (!ObjectUtils.isEmpty(companyUser)){ lname = companyUser.getRealName(); } project.setCompanyName(cname); project.setLeaderName(lname); @@ -187,18 +169,6 @@ { return toAjax(projectService.deleteProjectByIds(ids)); } /** * 查询异常项目列表 */ @GetMapping("/proExceptionList") @ResponseBody public TableDataInfo proExceptionList(){ startPage(); List<ExceptionProjectVo> list = projectService.proExceptionList(); return getDataTable(list); } } javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectWorkController.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Project.java
@@ -42,10 +42,41 @@ /** 区县 */ @Excel(name = "区县") private Integer district; private String district; private String districtName; /** 经度 */ private Double lng; /** 纬度 */ private Double lat; /** 进度 */ private String rate; public Double getLng() { return lng; } public void setLng(Double lng) { this.lng = lng; } public Double getLat() { return lat; } public void setLat(Double lat) { this.lat = lat; } public String getRate() { return rate; } public void setRate(String rate) { this.rate = rate; } public String getDistrictName() { return districtName; @@ -95,6 +126,17 @@ @JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss",timezone = "GMT+8") private Date endTime; @JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss",timezone = "GMT+8") private Date startTime; public Date getStartTime() { return startTime; } public void setStartTime(Date startTime) { this.startTime = startTime; } /** 钻孔编号 */ private Integer holeNum; @@ -177,12 +219,12 @@ { return companyId; } public void setDistrict(Integer district) public void setDistrict(String district) { this.district = district; } public Integer getDistrict() public String getDistrict() { return district; } javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/CollectStatisticsMapper.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/CompanyMapper.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/CompanyUserMapper.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/DataSourceMapper.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/ExceptionConfigMapper.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/HandleExceptionMapper.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/HandleOpinionMapper.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/LaborUnitMapper.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/ProjectMapper.java
@@ -30,12 +30,6 @@ */ public List<Project> selectProjectList(Project project); /** * 根据序列号查询 * @param project * @return */ public Project selectProjectBySerialNumber(@Param("serialNumber") String serialNumber); /** * 新增项目 @@ -69,9 +63,5 @@ */ public int deleteProjectByIds(String[] idss); Long selectAllProjectNum(); Long selectProjectNum(); List<Project> proExceptionList(); } javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ICollectStatisticsService.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ICompanyService.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ICompanyUserService.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IDataSourceService.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IExceptionConfigService.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IHandleExceptionService.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IHandleOpinionService.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ILaborUnitService.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IProjectService.java
@@ -61,8 +61,5 @@ */ public int deleteProjectById(String ids); /** * 查询异常项目列表 */ List<ExceptionProjectVo> proExceptionList(); } javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IProjectWorkService.java
@@ -10,21 +10,6 @@ */ public interface IProjectWorkService { /** * 工作量统计 * * @return */ AjaxResult workloadAccount(String projectId); /** * 获取钻孔数据 * @return */ AjaxResult holeRecordList(String holeId); List<Map<Object,Object>> histogramJson(String holeId); } javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/CollectStatisticsServiceImpl.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/CompanyServiceImpl.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/CompanyUserServiceImpl.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DataSourceServiceImpl.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ExceptionConfigServiceImpl.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HandleExceptionServiceImpl.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HandleOpinionServiceImpl.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/LaborUnitServiceImpl.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectServiceImpl.java
@@ -1,26 +1,15 @@ package com.javaweb.geo.service.impl; import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; import java.util.stream.Collectors; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.javaweb.common.utils.DateUtils; import com.javaweb.framework.util.ShiroUtils; import com.javaweb.common.utils.IdGenerate; import com.javaweb.common.utils.StringUtils; import com.javaweb.geo.domain.*; import com.javaweb.geo.mapper.*; import com.javaweb.geo.service.*; import com.javaweb.geo.vo.ExceptionProjectVo; import com.javaweb.geotdp.enums.RecordType; import com.javaweb.system.domain.SysRole; import com.javaweb.system.domain.SysUser; import com.javaweb.system.mapper.SysUserMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.javaweb.common.core.text.Convert; import org.springframework.util.ObjectUtils; /** * 项目Service业务层处理 @@ -32,33 +21,6 @@ public class ProjectServiceImpl implements IProjectService { @Autowired private ProjectMapper projectMapper; @Autowired private HandleExceptionMapper handleExceptionMapper; @Autowired private SysUserMapper sysUserMapper; @Autowired private HoleMapper holeMapper; @Autowired private HoleBiaoguanMapper holeBiaoguanMapper; @Autowired private HoleHuiciMapper holeHuiciMapper; @Autowired private HolePersonMapper holePersonMapper; @Autowired private HoleQutuMapper holeQutuMapper; @Autowired private HoleShuiweiMapper holeShuiweiMapper; @Autowired private HoleYantuMapper holeYantuMapper; /** * 查询项目 @@ -79,29 +41,7 @@ */ @Override public List<Project> selectProjectList(Project project) { //return projectMapper.selectProjectList(project); List<Project> resultList = new ArrayList<>(); SysUser sysUser = ShiroUtils.getSysUser(); List<SysRole> roles = sysUser.getRoles(); if (!ObjectUtils.isEmpty(roles)) { LinkedHashSet<String> collect = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toCollection(LinkedHashSet::new)); // 管理员角色 if (collect.contains(RecordType.role_admin.getId())) { resultList = projectMapper.selectProjectList(project); } // 普通角色 if (collect.contains(RecordType.role_gongsi.getId())) { SysUser u = sysUserMapper.selectUserById(sysUser.getUserId()); project.setCompanyId(u.getCompanyId()); resultList = projectMapper.selectProjectList(project); } } return resultList; return projectMapper.selectProjectList(project); } /** @@ -112,7 +52,9 @@ */ @Override public int insertProject(Project project) { project.setCreateTime(DateUtils.getNowDate()); if(StringUtils.isEmpty(project.getIds())){ project.setIds(IdGenerate.nextId()); } return projectMapper.insertProject(project); } @@ -147,82 +89,8 @@ @Override public int deleteProjectById(String ids) { // 删除项目关联的钻孔数据 String[] strings = Convert.toStrArray(ids); if (!ObjectUtils.isEmpty(strings)) { for (String projectId : strings) { // =======钻孔========== List<Hole> holes = holeMapper.selectHoleByProjectId(projectId); String[] holeIds = holes.stream().map(Hole::getIds).toArray(String[]::new); // =======标贯========== List<HoleBiaoguan> biaoguans = holeBiaoguanMapper.selectHoleBiaoguanByProjectId(projectId); String[] biaoguanIds = biaoguans.stream().map(HoleBiaoguan::getIds).toArray(String[]::new); // =======回次========== List<HoleHuici> holeHuicis = holeHuiciMapper.selectHoleHuiciByProjectId(projectId); String[] huiCiIds = holeHuicis.stream().map(HoleHuici::getIds).toArray(String[]::new); // =======人员========== List<HolePerson> persons = holePersonMapper.selectHolePersonByProjectId(projectId); String[] personIds = persons.stream().map(HolePerson::getIds).toArray(String[]::new); // =======取土========== List<HoleQutu> qutus = holeQutuMapper.selectHoleQutuByProjectId(projectId); String[] qutuIds = qutus.stream().map(HoleQutu::getIds).toArray(String[]::new); // =======水位========== List<HoleShuiwei> shuiweis = holeShuiweiMapper.selectHoleShuiWeiByProjectId(projectId); String[] shuiweiIds = shuiweis.stream().map(HoleShuiwei::getIds).toArray(String[]::new); // =======岩土========== List<HoleYantu> yantus = holeYantuMapper.selectHoleYantuByProjectId(projectId); String[] yantusIds = yantus.stream().map(HoleYantu::getIds).toArray(String[]::new); holeMapper.deleteHoleByIds(holeIds); holeBiaoguanMapper.deleteHoleBiaoguanByIds(biaoguanIds); holeHuiciMapper.deleteHoleHuiciByIds(huiCiIds); holePersonMapper.deleteHolePersonByIds(personIds); holeQutuMapper.deleteHoleQutuByIds(qutuIds); holeShuiweiMapper.deleteHoleShuiweiByIds(shuiweiIds); holeYantuMapper.deleteHoleYantuByIds(yantusIds); } } return projectMapper.deleteProjectById(ids); } /** * 查询异常项目列表 */ @Override public List<ExceptionProjectVo> proExceptionList() { List<Project> list = projectMapper.proExceptionList(); List<ExceptionProjectVo> resultList = new ArrayList<>(); ExceptionProjectVo item; if (ObjectUtil.isNotEmpty(list)) { for (Project project : list) { item = new ExceptionProjectVo(); BeanUtil.copyProperties(project, item); List<HandleException> exceptionList = handleExceptionMapper.selectListByProjectId(project.getIds()); String holeCodes = "", time = ""; if (ObjectUtil.isNotEmpty(exceptionList)) { holeCodes = exceptionList.stream().map(HandleException::getHoleCode).collect(Collectors.joining(",", "", "")); time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, exceptionList.get(0).getMapTime()) + "~" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, exceptionList.get(exceptionList.size() - 1).getMapTime()); } item.setExceptionNum(exceptionList.size()); item.setHoleCodes(holeCodes); item.setTime(time); resultList.add(item); } } return resultList; } } javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectWorkServiceImpl.java
@@ -2,7 +2,6 @@ import com.javaweb.common.core.domain.AjaxResult; import com.javaweb.common.exception.BusinessException; import com.javaweb.common.json.JSON; import com.javaweb.common.utils.NumberUtils; import com.javaweb.common.utils.StringUtils; import com.javaweb.geo.domain.*; @@ -10,9 +9,6 @@ import com.javaweb.geo.service.IProjectWorkService; import com.javaweb.geo.vo.ProjectWorkVo; import com.javaweb.geo.vo.YanTuVo; import com.javaweb.geotdp.domain.ResponseResult; import com.javaweb.geotdp.enums.RecordType; import com.javaweb.platform.domain.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,431 +21,6 @@ @Autowired private ProjectMapper projectMapper; @Autowired private HoleMapper holeMapper; @Autowired private HoleHuiciMapper holeHuiciMapper; @Autowired private HoleYantuMapper holeYantuMapper; @Autowired private HoleQutuMapper holeQutuMapper; @Autowired private HoleBiaoguanMapper holeBiaoguanMapper; @Autowired private HoleShuiweiMapper holeShuiweiMapper; @Autowired private HolePersonMapper holePersonMapper; @Autowired private HoleMediaMapper holeMediaMapper; /** * 工作量统计 */ @Override public AjaxResult workloadAccount(String projectId) { ProjectWorkVo projectWorkVo; try { projectWorkVo = getProjectWork(projectId); } catch (Exception e) { e.printStackTrace(); return AjaxResult.error("获取工作量统计失败"); } return AjaxResult.success("获取工作量统计成功", projectWorkVo); } /** * 获取钻孔数据 * @param holeId * @return */ @Override public AjaxResult holeRecordList(String holeId){ AjaxResult ajaxResult = AjaxResult.success("获取钻孔数据成功"); try{ Hole hole = holeMapper.selectHoleById(holeId); ajaxResult.put("hole",hole); HoleYantu holeYantu = new HoleYantu(); holeYantu.setHoleId(holeId); holeYantu.setIsDelete(false); holeYantuMapper.selectHoleYantuList(holeYantu); List<HoleYantu> yantus = holeYantuMapper.selectHoleYantuList(holeYantu); ajaxResult.put("yantuList",yantus); }catch (Exception e){ e.printStackTrace(); return AjaxResult.error("取钻孔数据失败"); } return ajaxResult; } /** * 地质钻孔柱状图 * @param holeId * @return */ @Override public List<Map<Object, Object>> histogramJson(String holeId) { List<Map<Object,Object>> mapList=new ArrayList<>(); //====================岩土================== HoleYantu holeYantu = new HoleYantu(); holeYantu.setHoleId(holeId); holeYantu.setIsDelete(false); List<HoleYantu> holeYantuList =holeYantuMapper.selectHoleYantuList(holeYantu); holeYantuList= holeYantuList.stream().filter(v->v.getBeginDepth() !=null && v.getEndDepth() !=null).collect(Collectors.toList()); holeYantuList = holeYantuList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(HoleYantu:: getEndDepth))), ArrayList::new)); try { holeYantuList.sort((x, y) -> Double.compare(x.getEndDepth(), y.getEndDepth())); } catch(Exception e) { throw new BusinessException("岩土数据排序异常:"+e.toString()); } for(HoleYantu yantu:holeYantuList) { Map<Object,Object> map=new HashMap<Object,Object>(); map.put("id", yantu.getIds()); map.put("type", "岩土"); map.put("code", yantu.getCode()); map.put("typeName", yantu.getFrequencyType()); map.put("layerName", yantu.getLayerName()); map.put("begin", yantu.getBeginDepth()); map.put("end", yantu.getEndDepth()); map.put("medias",new String[0]); String title=""; if(!StringUtils.isEmpty(yantu.getFrequencyType())){ title+="岩土类型："+yantu.getFrequencyType()+";"; } if(!StringUtils.isEmpty(yantu.getLayerName())){ title+="岩土定名："+yantu.getLayerName()+";"; } if(!StringUtils.isEmpty(yantu.getYs())) { title+="颜色："+yantu.getYs()+";"; } if(!StringUtils.isEmpty(yantu.getMsd())) { title+="密实度："+yantu.getMsd()+";"; } if(!StringUtils.isEmpty(yantu.getSd())) { title+="湿度："+yantu.getSd()+";"; } if(!StringUtils.isEmpty(yantu.getYbljx())) { title+="一般粒径小："+yantu.getYbljx()+";"; } if(!StringUtils.isEmpty(yantu.getYbljd())) { title+="一般粒径大："+yantu.getYbljd()+";"; } if(!StringUtils.isEmpty(yantu.getZdlj())) { title+="最大粒径："+yantu.getZdlj()+";"; } if(!StringUtils.isEmpty(yantu.getZt())) { title+="状态："+yantu.getZt()+";"; } if(!StringUtils.isEmpty(yantu.getBhw())) { title+="包含物："+yantu.getBhw()+";"; } if(!StringUtils.isEmpty(yantu.getKlxz())) { title+="颗粒形状："+yantu.getKlxz()+";"; } if(!StringUtils.isEmpty(yantu.getKlpl())) { title+="颗粒排列："+yantu.getKlpl()+";"; } if(!StringUtils.isEmpty(yantu.getKljp())) { title+="颗粒级配："+yantu.getKljp()+";"; } map.put("title", title); mapList.add(map); } //=========================水位================================== HoleShuiwei holeShuiwei = new HoleShuiwei(); holeShuiwei.setHoleId(holeId); holeShuiwei.setIsDelete(false); List<HoleShuiwei> shuiweiList = holeShuiweiMapper.selectHoleShuiweiList(holeShuiwei); shuiweiList=shuiweiList.stream().filter(v->v.getShownWaterLevel()!=null&&v.getStillWaterLevel()!=null).collect(Collectors.toList()); try { shuiweiList.sort((x, y) -> Double.compare(x.getShownWaterLevel(),y.getShownWaterLevel())); } catch(Exception e) { throw new BusinessException("水位数据排序异常:"+e.toString()); } for(HoleShuiwei shuiwei:shuiweiList) { Map<Object,Object> map=new HashMap<Object,Object>(); map.put("id", shuiwei.getIds()); map.put("type", "水位"); map.put("code", shuiwei.getCode()); map.put("typeName", "地下水"); map.put("begin", shuiwei.getShownTime()); map.put("end", shuiwei.getStillWaterLevel()); map.put("medias",new String[0]); String title=""; if(shuiwei.getShownWaterLevel() !=null){ title+="初见水位："+shuiwei.getShownWaterLevel()+";"; } if(shuiwei.getStillWaterLevel() !=null){ title+="稳定水位："+shuiwei.getStillWaterLevel()+";"; } map.put("title", title); mapList.add(map); } try { mapList.sort((x, y) -> Double.compare(Double.parseDouble(x.get("begin").toString()),Double.parseDouble(y.get("begin").toString()))); } catch(Exception e) { System.out.print(e); } //==========================回次========================== HoleHuici holeHuici = new HoleHuici(); holeHuici.setHoleId(holeId); holeHuici.setIsDelete(false); List<HoleHuici> huiciList = holeHuiciMapper.selectHoleHuiciList(holeHuici); huiciList=huiciList.stream().filter(v->v.getBeginDepth()!=null&&v.getEndDepth()!=null).collect(Collectors.toList()); try { huiciList.sort((x, y) -> Double.compare(x.getEndDepth(),y.getEndDepth())); } catch(Exception e) { System.out.print(e); } for(HoleHuici huici:huiciList) { Map<Object,Object> map=new HashMap<Object,Object>(); map.put("id", huici.getIds()); map.put("type", "回次"); map.put("code", huici.getCode()); map.put("typeName", huici.getFrequencyType()+'-'+huici.getFrequencyMode()); map.put("begin", huici.getBeginDepth()); map.put("end", huici.getEndDepth()); map.put("medias",new String[0]); String title=""; if(!StringUtils.isEmpty(huici.getFrequencyType())) { title+="钻进方法："+huici.getFrequencyType()+";"; } if(!StringUtils.isEmpty(huici.getFrequencyMode())) { title+="护壁方法："+huici.getFrequencyMode()+";"; } if(huici.getAperture() !=null ) { title+="钻孔孔径："+huici.getAperture()+";"; } if(huici.getBeginDepth() != null ) { title+="起始深度："+huici.getBeginDepth()+";"; } if(huici.getEndDepth() !=null) { title+="终止深度："+huici.getEndDepth()+";"; } map.put("title", title); mapList.add(map); } //=======================取样 / 取土========================== HoleQutu holeQutu = new HoleQutu(); holeQutu.setHoleId(holeId); holeQutu.setIsDelete(false); List<HoleQutu> qutuList = holeQutuMapper.selectHoleQutuList(holeQutu); qutuList=qutuList.stream().filter(v->v.getBeginDepth()!=null&&v.getEndDepth()!=null).collect(Collectors.toList()); try { qutuList.sort((x, y) -> Double.compare(x.getEndDepth(),y.getEndDepth())); } catch(Exception e) { System.out.print(e); } for(HoleQutu qutu:qutuList) { Map<Object,Object> map=new HashMap<Object,Object>(); map.put("id", qutu.getIds()); map.put("type", "取土"); map.put("code",qutu.getCode()); map.put("typeName", "取土"); map.put("begin", qutu.getBeginDepth()); map.put("end", qutu.getEndDepth()); map.put("medias",new String[0]); String title=""; if(!StringUtils.isEmpty(qutu.getEarthType())) { title+="土样质量等级："+qutu.getEarthType()+";"; } if(!StringUtils.isEmpty(qutu.getGetMode())) { title+="取样工具和方法："+qutu.getGetMode()+";"; } map.put("title", title); mapList.add(map); } //==================动探/标贯=========================== HoleBiaoguan holeBiaoguan = new HoleBiaoguan(); holeBiaoguan.setHoleId(holeId); holeBiaoguan.setIsDelete(false); List<HoleBiaoguan> biaoguanList = holeBiaoguanMapper.selectHoleBiaoguanList(holeBiaoguan); try { biaoguanList.sort((x, y) -> Double.compare(x.getBegin1(),y.getBegin1())); } catch(Exception e) { System.out.print(e); } for(HoleBiaoguan biaogaun:biaoguanList) { if(biaogaun.getBegin1() != null && biaogaun.getBegin1() !=0 ) { Map<Object,Object> map=new HashMap<Object,Object>(); map.put("id", biaogaun.getIds()); if(biaogaun.getType().equals(RecordType.dt.getId())) { map.put("type", "动探"); map.put("typeName", "动探"); } else if(biaogaun.getType().equals(RecordType.bg.getId())) { map.put("type", "标贯"); map.put("typeName", "标贯"); } map.put("code", biaogaun.getCode()); map.put("begin", biaogaun.getBegin1()); // Double endDepth=0.0; //此处end 有疑问 map.put("end", biaogaun.getEnd1()); map.put("medias",new String[0]); String title=""; if(biaogaun.getDrillLength()!=null) { title+="钻杆长度："+biaogaun.getDrillLength()+";"; } if(biaogaun.getBegin1()!=null && biaogaun.getBlow1() !=null) { title+="<br/>预："+biaogaun.getBegin1()+"m~"+biaogaun.getEnd1()+"m="+biaogaun.getBlow1()+";"; } if(biaogaun.getBegin2()!=null && biaogaun.getBlow2() !=null) { title+="<br/>1："+biaogaun.getBegin2()+"m~"+biaogaun.getEnd2()+"m="+biaogaun.getBlow2()+";"; } if(biaogaun.getBegin3()!=null&&biaogaun.getBlow3() !=null) { title+="<br/>2："+biaogaun.getBegin3()+"m~"+biaogaun.getEnd3()+"m="+biaogaun.getBlow3()+";"; } if(biaogaun.getBegin4()!=null&&biaogaun.getBlow4() !=null) { title+="<br/>3："+biaogaun.getBegin4()+"m~"+biaogaun.getEnd4()+"m="+biaogaun.getBlow4()+";"; } map.put("title", title); mapList.add(map); } } return mapList; } /** * 工作量统计 * @param projectId * @return */ private ProjectWorkVo getProjectWork(String projectId){ // 水位 + 取水 Long shuiWeiCount = holeShuiweiMapper.countNumberByProjectId(projectId, RecordType.sw.getName()); Long quShuiCount = holeShuiweiMapper.countNumberByProjectId(projectId, RecordType.qs.getName()); // 标贯 + 动探 Long biaoGuanCount = holeBiaoguanMapper.countNumberByProjectId(projectId, RecordType.bg.getName()); Long dongKanCount = holeBiaoguanMapper.countNumberByProjectId(projectId, RecordType.dt.getName()); // 照片 Long zhaoPianCount = holeMediaMapper.countNumberByProjectId(projectId); //取样(回次) Long huiCiCount = holeHuiciMapper.countNumberByProjectId(projectId); //TODO 回次总进尺、总次数 //TODO 岩土对象 ProjectWorkVo projectWorkVo = new ProjectWorkVo(); projectWorkVo.setHuiciCount(-1d); projectWorkVo.setHuiciNumber(huiCiCount); projectWorkVo.setShuiWeiNumber(shuiWeiCount); projectWorkVo.setQuYangNumber(huiCiCount); projectWorkVo.setQuShuiNumber(quShuiCount); projectWorkVo.setDongTanNumber(dongKanCount); projectWorkVo.setBiaoGuanNumber(biaoGuanCount); projectWorkVo.setZhaoPianNumber(zhaoPianCount); //获取岩土的对象集合 List<YanTuVo> yantuList = YanTuVoList(projectId); projectWorkVo.setYanTuList(yantuList); return projectWorkVo; } /** * 获取岩土工作量表格 * @return */ private List<YanTuVo> YanTuVoList(String projectId){ HoleYantu holeYantu = new HoleYantu(); holeYantu.setProjectId(projectId); holeYantu.setIsDelete(false); //List<HoleYantu> yantus = holeYantuMapper.selectHoleYantuList(holeYantu); List<HoleYantu> yantus = holeYantuMapper.selectTongjiHoleYantuList(holeYantu); Map <String,Integer> cishuMap= new HashMap<>(); Map<String,Double> jinchiMap = new HashMap<>(); for(HoleYantu tu : yantus){ String ftype = tu.getFrequencyType(); if(StringUtils.isEmpty(ftype)){ continue; } Double begin = tu.getBeginDepth(); Double end = tu.getEndDepth(); if(begin==null || end ==null){ continue; } Double total = end-begin; if(cishuMap.containsKey(ftype)){ cishuMap.put(ftype,cishuMap.get(ftype)+1); jinchiMap.put(ftype,jinchiMap.get(ftype)+total); }else{ cishuMap.put(ftype,1); jinchiMap.put(ftype,total); } } Integer CISHU = 0; Double JINCHI=0d; List<YanTuVo> list = new ArrayList<>(); for(Map.Entry<String,Integer> entry : cishuMap.entrySet() ){ CISHU +=entry.getValue(); JINCHI += jinchiMap.get(entry.getKey()); //设置vo对象 YanTuVo yanTuVo = new YanTuVo(); yanTuVo.setFrequencyType(entry.getKey()); yanTuVo.setCishuNumber(entry.getValue().longValue()); yanTuVo.setJinchiCount(NumberUtils.div(jinchiMap.get(entry.getKey()),1,2)); list.add(yanTuVo); } YanTuVo yan = new YanTuVo(); yan.setFrequencyType("总计"); yan.setJinchiCount(NumberUtils.div(JINCHI,1,2)); yan.setCishuNumber(CISHU.longValue()); List<YanTuVo> result = new ArrayList<>(); result.add(yan); result.addAll(list); return result; } } javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/controller/GeoDataController.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/domain/ResponseResult.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/enums/CityConst.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/enums/RecordType.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/service/impl/GeoDataServiceImpl.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/CompanyUserVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/CompanyVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/DeletedVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionDetailRecordVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionDetailVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionHandle.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionResponseVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/HoleVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/IndexCollectVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/LaborUnitVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/MediaVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/PeopleDetail.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/PeopleDetailVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ProjectCheckVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ProjectVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordBaseVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordHCVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordPersonVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordQTVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordSWVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordYTVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordYWVo.java
File was deleted javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/CollectStatisticsMapper.xml
File was deleted javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/CompanyMapper.xml
File was deleted javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/CompanyUserMapper.xml
File was deleted javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DataSourceMapper.xml
File was deleted javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ExceptionConfigMapper.xml
File was deleted javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HandleExceptionMapper.xml
File was deleted javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HandleOpinionMapper.xml
File was deleted javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/LaborUnitMapper.xml
File was deleted javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectMapper.xml
@@ -11,7 +11,7 @@ <result property="code" column="code" /> <result property="companyId" column="company_id" /> <result property="companyName" column="company_name" /> <result property="createTime" column="create_time" /> <result property="startTime" column="start_time" /> <result property="endTime" column="end_time" /> <result property="district" column="district" /> <result property="fullName" column="full_name" /> @@ -27,121 +27,37 @@ <result property="statusChangeUser" column="status_change_user" /> <result property="statusChangeReason" column="status_change_reason" /> <result property="dataSource" column="data_source" /> <result property="lng" column="lng" /> <result property="lat" column="lat" /> <result property="rate" column="rate" /> <result property="createTime" column="create_time" /> </resultMap> <sql id="selectProjectVo"> select ids, address, city, code, company_id, create_time,end_time, district, full_name, labor_unit, leader, owner, province, serial_number, 'describe', status, is_deleted, status_change_user, status_change_reason, data_source from js_project select ids, address, city, code, company_id,start_time,end_time, district, full_name, labor_unit, leader, owner, province, serial_number, 'describe', status, is_deleted, status_change_user, status_change_reason, data_source,lng,lat,rate,create_time from js_project </sql> <select id="selectProjectList" parameterType="Project" resultMap="ProjectResult"> <!-- <include refid="selectProjectVo"/>--> select p.ids, p.address, p.city, p.code, p.company_id, c.full_name AS company_name, p.create_time, p.end_time, p.district, p.full_name, p.labor_unit, p.leader, u.real_name AS leader_name, p.owner, p.province, p.serial_number, 'p.describe', p.status, p.is_deleted, p.status_change_user, p.status_change_reason, p.data_source FROM js_project p LEFT JOIN js_company_user u ON p.leader = u.ids LEFT JOIN js_company c ON p.company_id = c.ids <include refid="selectProjectVo"/> <where> p.is_deleted='0' <if test="address != null and address != ''"> and p.address = #{address}</if> <if test="city != null "> and p.city = #{city}</if> <if test="code != null and code != ''"> and p.code = #{code}</if> <if test="companyId != null "> and p.company_id = #{companyId}</if> <if test="district != null and district != ''"> and p.district = #{district}</if> <if test="fullName != null and fullName != ''"> and p.full_name like concat('%', #{fullName}, '%')</if> <if test="laborUnit != null and laborUnit != ''"> and p.labor_unit = #{laborUnit}</if> <if test="leader != null and leader != ''"> and p.leader = #{leader}</if> <if test="owner != null and owner != ''"> and p.owner = #{owner}</if> <if test="province != null and province != ''"> and p.province = #{province}</if> <if test="serialNumber != null and serialNumber != ''"> and p.serial_number = #{serialNumber}</if> <if test="describe != null and describe != ''"> and p.describe = #{describe}</if> <if test="status != null and status != ''"> and p.status = #{status}</if> <if test="isDeleted != null and isDeleted != ''"> and p.is_deleted = #{isDeleted}</if> ORDER BY p.create_time DESC <if test="address != null and address != ''"> and address = #{address}</if> <if test="city != null "> and city = #{city}</if> <if test="code != null and code != ''"> and code = #{code}</if> <if test="district != null and district != ''"> and district = #{district}</if> <if test="fullName != null and fullName != ''"> and full_name like concat('%', #{fullName}, '%')</if> <if test="laborUnit != null and laborUnit != ''"> and labor_unit = #{laborUnit}</if> <if test="leader != null and leader != ''"> and leader = #{leader}</if> <if test="owner != null and owner != ''"> and owner = #{owner}</if> <if test="province != null and province != ''"> and province = #{province}</if> <if test="serialNumber != null and serialNumber != ''"> and serial_number = #{serialNumber}</if> <if test="status != null and status != ''"> and status = #{status}</if> <if test="isDeleted != null and isDeleted != ''"> and is_deleted = #{isDeleted}</if> </where> </select> <select id="selectProjectById" parameterType="String" resultMap="ProjectResult"> select p.ids, p.address, p.city, p.code, p.company_id, c.full_name AS company_name, p.create_time, p.end_time, p.district, p.full_name, p.labor_unit, p.leader, u.real_name AS leader_name, p.owner, p.province, p.serial_number, 'p.describe', p.status, p.is_deleted, p.status_change_user, p.status_change_reason, p.data_source FROM js_project p LEFT JOIN js_company_user u ON p.leader = u.ids LEFT JOIN js_company c ON p.company_id = c.ids WHERE p.is_deleted='0' and p.ids = #{ids} </select> <select id="selectProjectBySerialNumber" resultMap="ProjectResult"> <include refid="selectProjectVo"/> where serial_number = #{serialNumber} and is_deleted='0' </select> <select id="selectAllProjectNum" resultType="java.lang.Long"> SELECT count(ids) FROM js_project WHERE is_deleted = '0' </select> <select id="selectProjectNum" resultType="java.lang.Long"> SELECT count(ids) FROM js_project WHERE `status` = '0' AND is_deleted = '0' </select> <select id="proExceptionList" resultMap="ProjectResult"> SELECT p.ids, p.full_name, c.full_name as company_name, u.real_name as leader_name FROM js_project p, js_company_user u, js_company c WHERE p.leader = u.ids AND p.company_id = c.ids AND p.is_deleted = '0' AND p.ids = ANY ( SELECT project_id FROM js_handle_exception WHERE is_delete = '0' GROUP BY project_id ) WHERE ids = #{ids} </select> <insert id="insertProject" parameterType="Project"> @@ -152,7 +68,8 @@ <if test="city != null ">city,</if> <if test="code != null and code != ''">code,</if> <if test="companyId != null ">company_id,</if> <if test="createTime != null ">create_time,</if> <if test="startTime != null ">start_time,</if> <if test="endTime != null ">end_time,</if> <if test="district != null and district != ''">district,</if> <if test="fullName != null and fullName != ''">full_name,</if> <if test="laborUnit != null and laborUnit != ''">labor_unit,</if> @@ -166,6 +83,10 @@ <if test="statusChangeUser != null and statusChangeUser != ''">status_change_user,</if> <if test="statusChangeReason != null and statusChangeReason != ''">status_change_reason,</if> <if test="dataSource != null and dataSource != ''">data_source,</if> <if test="lng != null">lng,</if> <if test="lat != null">lat,</if> <if test="rate != null and rate != ''">rate,</if> <if test="createTime != null ">create_time,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="ids != null and ids != ''">#{ids},</if> @@ -173,7 +94,9 @@ <if test="city != null ">#{city},</if> <if test="code != null and code != ''">#{code},</if> <if test="companyId != null ">#{companyId},</if> <if test="createTime != null ">#{createTime},</if> <if test="startTime != null ">#{startTime},</if> <if test="endTime != null ">#{endTime},</if> <if test="district != null and district != ''">#{district},</if> <if test="fullName != null and fullName != ''">#{fullName},</if> <if test="laborUnit != null and laborUnit != ''">#{laborUnit},</if> @@ -187,6 +110,10 @@ <if test="statusChangeUser != null and statusChangeUser != ''">#{statusChangeUser},</if> <if test="statusChangeReason != null and isDeleted != ''">#{statusChangeReason},</if> <if test="dataSource != null and dataSource != ''">#{dataSource},</if> <if test="lng != null">#{lng},</if> <if test="lat != null">#{lat},</if> <if test="rate != null and rate != ''">#{rate},</if> <if test="createTime != null ">#{createTime},</if> </trim> </insert> @@ -197,7 +124,8 @@ <if test="city != null ">city = #{city},</if> <if test="code != null and code != ''">code = #{code},</if> <if test="companyId != null ">company_id = #{companyId},</if> <if test="createTime != null ">create_time = #{createTime},</if> <if test="startTime != null ">start_time = #{startTime},</if> <if test="endTime != null ">end_time = #{endTime},</if> <if test="district != null and district != ''">district = #{district},</if> <if test="fullName != null and fullName != ''">full_name = #{fullName},</if> <if test="laborUnit != null and laborUnit != ''">labor_unit = #{laborUnit},</if> @@ -211,6 +139,10 @@ <if test="statusChangeUser != null and statusChangeUser != ''">status_change_user = #{statusChangeUser},</if> <if test="statusChangeReason != null and statusChangeReason != ''">status_change_reason = #{statusChangeReason},</if> <if test="dataSource != null and dataSource != ''">data_source = #{dataSource},</if> <if test="lng != null">lng = #{lng},</if> <if test="lat != null">lat = #{lat},</if> <if test="rate != null and rate != ''">rate = #{rate},</if> <if test="createTime != null ">create_time = #{createTime},</if> </trim> where ids = #{ids} </update> javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/add.html
@@ -2,46 +2,43 @@ <html lang="zh" xmlns:th="http://www.thymeleaf.org" > <head> <th:block th:include="include :: header('新增项目')" /> <th:block th:include="include :: select2-css" /> <th:block th:include="include :: datetimepicker-css" /> </head> <body class="white-bg"> <div class="wrapper wrapper-content animated fadeInRight ibox-content"> <form class="form-horizontal m" id="form-project-add"> <div class="form-group"> <label class="col-sm-3 control-label">地址：</label> <label class="col-sm-3 control-label">项目编号：</label> <div class="col-sm-8"> <input name="code" class="form-control" required type="text"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">项目名称：</label> <div class="col-sm-8"> <input name="fullName" class="form-control" required type="text"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">区县：</label> <div class="col-sm-8"> <select name="district" class="form-control m-b" th:with="type=${@dict.getType('sys_district')}"> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> </select> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">详细地址：</label> <div class="col-sm-8"> <input name="address" class="form-control" type="text"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">城市：</label> <div class="col-sm-8"> <input name="city" class="form-control" type="text"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">项目编号：</label> <div class="col-sm-8"> <input name="code" class="form-control" type="text"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">企业ID：</label> <div class="col-sm-8"> <input name="companyId" class="form-control" type="text"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">区县：</label> <div class="col-sm-8"> <input name="district" class="form-control" type="text"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">项目名称：</label> <div class="col-sm-8"> <input name="fullName" class="form-control" type="text"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">劳务单位名称：</label> <div class="col-sm-8"> @@ -49,59 +46,59 @@ </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">项目负责人ID：</label> <label class="col-sm-3 control-label">项目负责人：</label> <div class="col-sm-8"> <input name="leader" class="form-control" type="text"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">业主：</label> <label class="col-sm-3 control-label">经度：</label> <div class="col-sm-8"> <input name="owner" class="form-control" type="text"> <input name="lng" class="form-control" required type="text"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">省份：</label> <label class="col-sm-3 control-label">纬度：</label> <div class="col-sm-8"> <input name="province" class="form-control" type="text"> <input name="lat" class="form-control" required type="text"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">项目序列号：</label> <label class="col-sm-3 control-label">开始时间：</label> <div class="col-sm-8"> <input name="serialNumber" class="form-control" type="text"> <input name="startTime" type="text" class="form-control" id="start-time" placeholder="选择项目起始时间"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">勘察大纲：</label> <label class="col-sm-3 control-label">结束时间：</label> <div class="col-sm-8"> <input name="describe" class="form-control" type="text"> <input name="endTime" type="text" class="form-control" id="end-time" placeholder="选择项目结束时间"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">项目状态：</label> <div class="col-sm-8"> <div class="radio-box"> <input type="radio" name="status" value=""> <label th:for="status" th:text="未知"></label> </div> <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">是否删除：</label> <div class="col-sm-8"> <input name="isDeleted" class="form-control" type="text"> </div> </div> </form> </div> <th:block th:include="include :: footer" /> <th:block th:include="include :: select2-js" /> <th:block th:include="include :: datetimepicker-js" /> <script type="text/javascript"> var prefix = ctx + "geo/project" $("#form-project-add").validate({ focusCleanup: true }); $("#start-time").datetimepicker({ format: "yyyy-mm-dd", minView: "month", autoclose: true }); $("#end-time").datetimepicker({ format: "yyyy-mm-dd", minView: "month", autoclose: true }); function submitHandler() { if ($.validate.form()) { javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/edit.html
@@ -2,17 +2,13 @@ <html lang="zh" xmlns:th="http://www.thymeleaf.org" > <head> <th:block th:include="include :: header('修改项目')" /> <th:block th:include="include :: select2-css" /> <th:block th:include="include :: datetimepicker-css" /> </head> <body class="white-bg"> <div class="wrapper wrapper-content animated fadeInRight ibox-content"> <form class="form-horizontal m" id="form-project-edit" th:object="${project}"> <input name="ids" th:field="*{ids}" type="hidden"> <div class="form-group"> <label class="col-sm-3 control-label">项目名称：</label> <div class="col-sm-8"> <input name="fullName" th:field="*{fullName}" class="form-control" type="text"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">项目编号：</label> <div class="col-sm-8"> @@ -20,70 +16,100 @@ </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">地址：</label> <label class="col-sm-3 control-label">项目名称：</label> <div class="col-sm-8"> <input name="fullName" th:field="*{fullName}" class="form-control" type="text"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">区县：</label> <div class="col-sm-8"> <select name="district" class="form-control m-b" th:with="type=${@dict.getType('sys_district')}"> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{district}"></option> </select> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">详细地址：</label> <div class="col-sm-8"> <input name="address" th:field="*{address}" class="form-control" type="text"> </div> </div> <!-- <div class="form-group"> --> <!-- <label class="col-sm-3 control-label">区县：</label>--> <!-- <div class="col-sm-8">--> <!-- <input name="district" th:field="*{district}" class="form-control" type="text">--> <!-- </div>--> <!-- </div>--> <div class="form-group"> <label class="col-sm-3 control-label">劳务单位名称：</label> <div class="col-sm-8"> <input name="laborUnit" th:field="*{laborUnit}" class="form-control" type="text"> </div> </div> <!-- <div class="form-group"> --> <!-- <label class="col-sm-3 control-label">项目负责人：</label>--> <!-- <div class="col-sm-8">--> <!-- <input name="leader" th:field="*{leader}" class="form-control" type="text">--> <!-- </div>--> <!-- </div>--> <div class="form-group"> <label class="col-sm-3 control-label">业主：</label> <label class="col-sm-3 control-label">项目负责人：</label> <div class="col-sm-8"> <input name="owner" th:field="*{owner}" class="form-control" type="text"> <input name="leader" th:field="*{leader}" class="form-control" type="text"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">项目序列号：</label> <label class="col-sm-3 control-label">经度：</label> <div class="col-sm-8"> <input name="serialNumber" th:field="*{serialNumber}" class="form-control" type="text"> <input name="lng" th:field="*{lng}" class="form-control" type="text"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">勘察大纲：</label> <label class="col-sm-3 control-label">纬度：</label> <div class="col-sm-8"> <input name="describe" th:field="*{describe}" class="form-control" type="text"> <input name="lat" th:field="*{lat}" class="form-control" type="text"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">数据来源：</label> <label class="col-sm-3 control-label">开始时间：</label> <div class="col-sm-8"> <input name="dataSource" th:field="*{dataSource}" class="form-control" type="text"> <input name="startTime" th:field="*{startTime}" type="text" class="form-control" id="start-time" placeholder="选择项目起始时间"> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">结束时间：</label> <div class="col-sm-8"> <input name="endTime" th:field="*{endTime}" type="text" class="form-control" id="end-time" placeholder="选择项目结束时间"> </div> </div> </form> </div> <th:block th:include="include :: footer" /> <th:block th:include="include :: select2-js" /> <th:block th:include="include :: datetimepicker-js" /> <script type="text/javascript"> var prefix = ctx + "geo/project"; $("#form-project-edit").validate({ focusCleanup: true }); $("#start-time").datetimepicker({ format: "yyyy-mm-dd", minView: "month", autoclose: true }); $("#end-time").datetimepicker({ format: "yyyy-mm-dd", minView: "month", autoclose: true }); function submitHandler() { if ($.validate.form()) { $.operate.save(prefix + "/edit", $('#form-project-edit').serialize()); } // var data = $("#form-user-edit").serializeArray(); // var status = $("input[id='status']").is(':checked') == true ? 0 : 1; // var roleIds = $.form.selectCheckeds("role"); // var postIds = $.form.selectSelects("post"); // data.push({"name": "status", "value": status}); // data.push({"name": "roleIds", "value": roleIds}); // data.push({"name": "postIds", "value": postIds}); // $.operate.saveTab(prefix + "/edit", data); } </script> </body> javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html
@@ -16,6 +16,10 @@ <input type="text" name="fullName"/> </li> <li> <p>项目编号：</p> <input type="text" name="code"/> </li> <li> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a> </li> @@ -25,9 +29,9 @@ </div> <div class="btn-group-sm" id="toolbar" role="group"> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="geo:project:add">--> <!-- <i class="fa fa-plus"></i> 添加--> <!-- </a>--> <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="geo:project:add"> <i class="fa fa-plus"></i> 添加 </a> <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="geo:project:edit"> <i class="fa fa-edit"></i> 修改 </a> @@ -58,6 +62,11 @@ checkbox: true }, { field : 'code', title : '项目编号', sortable:true }, { field : 'fullName', title : '项目名称', formatter: function(value, row, index) { @@ -66,65 +75,13 @@ sortable:true }, { field : 'companyName', title : '勘察单位' }, { field : 'laborUnit', title : '劳务单位' }, { field : 'district', title : '区县', formatter: function(value, row, index) { if(row.district === 1){ return "东城区"; }else if(row.district === 17){ return "密云县"; }else if(row.district === 16){ return "平谷区"; }else if(row.district === 15){ return "怀柔区"; }else if(row.district === 14){ return "大兴区"; }else if(row.district === 13){ return "昌平区"; }else if(row.district === 12){ return "顺义区"; }else if(row.district === 11){ return "通州区"; }else if(row.district === 10){ return "房山区"; }else if(row.district === 9){ return "门头沟区"; }else if(row.district === 8){ return "海淀区"; }else if(row.district === 7){ return "石景山区"; }else if(row.district === 6){ return "丰台区"; }else if(row.district === 5){ return "朝阳区"; }else if(row.district === 4){ return "宣武区"; }else if(row.district === 3){ return "崇文区"; }else if(row.district === 2){ return "西城区"; }else if(row.district === 18){ return "延庆县"; }else if(row.district === 99){ return "外埠"; }else { return ""; } } }, { field : 'owner', title : '业主名称' }, { field : 'leaderName', title : '项目负责人' @@ -143,10 +100,6 @@ return "验收"; } } }, { field : 'dataSource', title : '数据来源' }, { title: '操作', javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html
@@ -4,8 +4,8 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0"> <title>勘察信息化服务平台</title> <meta name="description" content="大数据平台"> <title>钻探工程信息化系统</title> <meta name="description" content="钻探工程信息化系统"> <!--[if lt IE 9]> <meta http-equiv="refresh" content="0;ie.html" /> <![endif]--> @@ -89,7 +89,7 @@ <span class="bar-line"></span> <form name="loginform" id="loginform"> <input type="hidden" id="redirectUrl" name="redirectUrl" value="${redirectUrl}" > <div><span id="logo-text">监管平台登录</span></div> <div><span id="logo-text">钻探工程信息化系统</span></div> <div class="input-container" style="margin-top:25px;position:relative;"> <img src="images/loginPage/user.png" /> javaweb-plus/javaweb-quartz/src/main/java/com/javaweb/quartz/task/CollectStatisticsTask.java
File was deleted javaweb-plus/javaweb-quartz/src/main/java/com/javaweb/quartz/task/HandleExceptionTask.java
File was deleted
