diff --git a/jwtech-pc/src/main/java/com/kms/web/controller/system/SysXzqhController.java b/jwtech-pc/src/main/java/com/kms/web/controller/system/SysXzqhController.java index 553e4dc0..6676eb14 100644 --- a/jwtech-pc/src/main/java/com/kms/web/controller/system/SysXzqhController.java +++ b/jwtech-pc/src/main/java/com/kms/web/controller/system/SysXzqhController.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.core.domain.entity.SysDept; @@ -56,6 +57,33 @@ public class SysXzqhController extends BaseController private SysDeptService sysDeptService; + @GetMapping("/getGuangDong") + public AjaxResult getGuangDong() { + + List list = sysXzqhService.list(Wrappers.lambdaQuery(SysXzqh.class) + .likeRight(SysXzqh::getXzqhdm, "44") + .eq(SysXzqh::getLayer, 2)); + + SysXzqh xzqh = new SysXzqh(); + xzqh.setLayer(2); + xzqh.setXzqhdm(""); + xzqh.setName("所有区域"); + list.add(0,xzqh); + + + + SysXzqh sysXzqh = new SysXzqh(); + sysXzqh.setLayer(2); + sysXzqh.setXzqhdm("省外"); + sysXzqh.setName("省外"); + list.add(1,sysXzqh); + return AjaxResult.success(list); + + + } + + + @GetMapping("/common") diff --git a/jwtech-pc/src/main/resources/application-druid-test.yml b/jwtech-pc/src/main/resources/application-druid-test.yml index e1c63aa8..589f781e 100644 --- a/jwtech-pc/src/main/resources/application-druid-test.yml +++ b/jwtech-pc/src/main/resources/application-druid-test.yml @@ -10,7 +10,7 @@ spring: # url: jdbc:mysql://172.17.0.2:23306/ruoyi_mybatisplus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 # username: root # password: mySql*ztFjs2023 - url: jdbc:mysql://rm-7xv36ek6qb84h9utmfo.mysql.rds.aliyuncs.com:3333/ruoyi_mybatisplus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true + url: jdbc:mysql://47.93.254.187:3306/sgc_js?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true username: shuili password: wuxukgdvJ1!@! # 从库数据源 diff --git a/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultController.java b/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultController.java new file mode 100644 index 00000000..b418a647 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultController.java @@ -0,0 +1,114 @@ +package com.kms.warn.controller; + +import java.util.Arrays; +import java.util.List; + +import com.jianwei.common.core.controller.BaseController; +import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jianwei.common.mybaitsplus.BeanToWrapper; + +import com.jianwei.common.annotation.Log; +import com.jianwei.common.core.domain.AjaxResult; +import com.jianwei.common.enums.BusinessType; +import com.kms.warn.domain.BsSgcJsjdWarnResult; +import com.kms.warn.service.BsSgcJsjdWarnResultService; + + +/** + * 预警结果Controller + * + * @author kms + * @date 2024-03-07 + */ +@RestController +@RequestMapping("/warn/result") +@Api(tags = "预警结果") +public class BsSgcJsjdWarnResultController extends BaseController +{ + @Autowired + private BsSgcJsjdWarnResultService bsSgcJsjdWarnResultService; + + /** + * 查询预警结果列表 + */ + @PostMapping("/list") + @ApiOperation("预警结果列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcJsjdWarnResultService.selectPage(sp); + } + + /** + * 导出预警结果列表 + */ + @Log(title = "预警结果导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("预警结果导出") + public AjaxResult export(@RequestBody BsSgcJsjdWarnResult bsSgcJsjdWarnResult) + { + List list = bsSgcJsjdWarnResultService.listByIds(bsSgcJsjdWarnResult.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcJsjdWarnResult.class); + return util.exportExcel(list, "result"); + } + + /** + * 获取预警结果详细信息 + */ + @ApiOperation(" 预警结果详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcJsjdWarnResultService.getById(id)); + } + + /** + * 新增预警结果 + */ + @Log(title = "预警结果新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("预警结果新增") + public AjaxResult add(@RequestBody BsSgcJsjdWarnResult bsSgcJsjdWarnResult) + { + BaseEntityUtils.preInsert(bsSgcJsjdWarnResult); + return toAjax(bsSgcJsjdWarnResultService.save(bsSgcJsjdWarnResult)); + } + + /** + * 修改预警结果 + */ + @ApiOperation("预警结果修改") + @Log(title = "预警结果修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcJsjdWarnResult bsSgcJsjdWarnResult) + { + return toAjax(bsSgcJsjdWarnResultService.updateById(bsSgcJsjdWarnResult)); + } + + /** + * 删除预警结果 + */ + @ApiOperation("预警结果删除") + @Log(title = "预警结果删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcJsjdWarnResultService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultHandleController.java b/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultHandleController.java new file mode 100644 index 00000000..39dd4a17 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultHandleController.java @@ -0,0 +1,114 @@ +package com.kms.warn.controller; + +import java.util.Arrays; +import java.util.List; + +import com.jianwei.common.core.controller.BaseController; +import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jianwei.common.mybaitsplus.BeanToWrapper; + +import com.jianwei.common.annotation.Log; +import com.jianwei.common.core.domain.AjaxResult; +import com.jianwei.common.enums.BusinessType; +import com.kms.warn.domain.BsSgcJsjdWarnResultHandle; +import com.kms.warn.service.BsSgcJsjdWarnResultHandleService; + + +/** + * 预警处理Controller + * + * @author kms + * @date 2024-03-07 + */ +@RestController +@RequestMapping("/warn/handle") +@Api(tags = "预警处理") +public class BsSgcJsjdWarnResultHandleController extends BaseController +{ + @Autowired + private BsSgcJsjdWarnResultHandleService bsSgcJsjdWarnResultHandleService; + + /** + * 查询预警处理列表 + */ + @PostMapping("/list") + @ApiOperation("预警处理列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcJsjdWarnResultHandleService.selectPage(sp); + } + + /** + * 导出预警处理列表 + */ + @Log(title = "预警处理导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("预警处理导出") + public AjaxResult export(@RequestBody BsSgcJsjdWarnResultHandle bsSgcJsjdWarnResultHandle) + { + List list = bsSgcJsjdWarnResultHandleService.listByIds(bsSgcJsjdWarnResultHandle.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcJsjdWarnResultHandle.class); + return util.exportExcel(list, "handle"); + } + + /** + * 获取预警处理详细信息 + */ + @ApiOperation(" 预警处理详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcJsjdWarnResultHandleService.getById(id)); + } + + /** + * 新增预警处理 + */ + @Log(title = "预警处理新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("预警处理新增") + public AjaxResult add(@RequestBody BsSgcJsjdWarnResultHandle bsSgcJsjdWarnResultHandle) + { + BaseEntityUtils.preInsert(bsSgcJsjdWarnResultHandle); + return toAjax(bsSgcJsjdWarnResultHandleService.save(bsSgcJsjdWarnResultHandle)); + } + + /** + * 修改预警处理 + */ + @ApiOperation("预警处理修改") + @Log(title = "预警处理修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcJsjdWarnResultHandle bsSgcJsjdWarnResultHandle) + { + return toAjax(bsSgcJsjdWarnResultHandleService.updateById(bsSgcJsjdWarnResultHandle)); + } + + /** + * 删除预警处理 + */ + @ApiOperation("预警处理删除") + @Log(title = "预警处理删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcJsjdWarnResultHandleService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResult.java b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResult.java new file mode 100644 index 00000000..cb2d5246 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResult.java @@ -0,0 +1,78 @@ +package com.kms.warn.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.jianwei.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + +import com.jianwei.common.core.domain.BaseEntity; + +/** + * 预警结果对象 bs_sgc_jsjd_warn_result + * + * @author kms + * @date 2024-03-07 + */ +@TableName("bs_sgc_jsjd_warn_result") +@Data +@ApiModel("预警结果") +public class BsSgcJsjdWarnResult extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String updateUid; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String proCode; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String proNo; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String owerDept; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String warnType; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String warnSubType; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String resultType; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String warnResult; + + /** 是否处理（0：未处理，1：已处理） */ + @Excel(name = "是否处理", readConverterExp = "0=：未处理，1：已处理") + @ApiModelProperty("是否处理") + private String isHandle; + +} diff --git a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResultHandle.java b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResultHandle.java new file mode 100644 index 00000000..3f07bad0 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResultHandle.java @@ -0,0 +1,83 @@ +package com.kms.warn.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.jianwei.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + +import com.jianwei.common.core.domain.BaseEntity; + +/** + * 预警处理对象 bs_sgc_jsjd_warn_result_handle + * + * @author kms + * @date 2024-03-07 + */ +@TableName("bs_sgc_jsjd_warn_result_handle") +@Data +@ApiModel("预警处理") +public class BsSgcJsjdWarnResultHandle extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String updateUid; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String proCode; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String proNo; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String owerDept; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String resultId; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String handleUser; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String checkUser; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String opinion; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String handlePhone; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String checkPhone; + +} diff --git a/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdWarnResultHandleMapper.java b/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdWarnResultHandleMapper.java new file mode 100644 index 00000000..8ec216d7 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdWarnResultHandleMapper.java @@ -0,0 +1,16 @@ +package com.kms.warn.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.warn.domain.BsSgcJsjdWarnResultHandle; + +/** + * 预警处理Mapper接口 + * + * @author kms + * @date 2024-03-07 + */ +@Repository +public interface BsSgcJsjdWarnResultHandleMapper extends BaseMapper { + +} diff --git a/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdWarnResultMapper.java b/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdWarnResultMapper.java new file mode 100644 index 00000000..d9837f81 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdWarnResultMapper.java @@ -0,0 +1,16 @@ +package com.kms.warn.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.warn.domain.BsSgcJsjdWarnResult; + +/** + * 预警结果Mapper接口 + * + * @author kms + * @date 2024-03-07 + */ +@Repository +public interface BsSgcJsjdWarnResultMapper extends BaseMapper { + +} diff --git a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultHandleService.java b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultHandleService.java new file mode 100644 index 00000000..cf3db70f --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultHandleService.java @@ -0,0 +1,17 @@ +package com.kms.warn.service; + +import org.springframework.stereotype.Service; +import com.jianwei.common.core.service.BaseService; +import com.kms.warn.mapper.BsSgcJsjdWarnResultHandleMapper; +import com.kms.warn.domain.BsSgcJsjdWarnResultHandle; + +/** + * 预警处理Service接口 + * + * @author kms + * @date 2024-03-07 + */ +@Service +public class BsSgcJsjdWarnResultHandleService extends BaseService{ + +} diff --git a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultService.java b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultService.java new file mode 100644 index 00000000..89f5b2e4 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultService.java @@ -0,0 +1,17 @@ +package com.kms.warn.service; + +import org.springframework.stereotype.Service; +import com.jianwei.common.core.service.BaseService; +import com.kms.warn.mapper.BsSgcJsjdWarnResultMapper; +import com.kms.warn.domain.BsSgcJsjdWarnResult; + +/** + * 预警结果Service接口 + * + * @author kms + * @date 2024-03-07 + */ +@Service +public class BsSgcJsjdWarnResultService extends BaseService{ + +} diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml index 052fa3f7..a5516351 100644 --- a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml @@ -210,8 +210,82 @@ + + SELECT + t.ENGINEERING_GRADE, + t.PRO_NO, + t.PRO_CODE, + pp.ADCD, + pp.IS_BELONG_PLANNING, + t.commencement_date, + ca.COMPLETION_ACCEPTANCE_TIME, + pbi.REPORT_TIME, + SUM(sf.release_funds) AS source_total, + SUM(sf.CENTRAL_ARRANGED_FUNDS) AS source_center, + SUM(sf.PROVINCIAL_FUNDING + sf.CITY_LEVEL_FUNDS + sf.COUNTY_LEVEL_FUNDS + sf.TOWNSHIP_INVESTMENTS) AS source_land, + SUM(pf.center_paidin_amount+pf.provincial_paidin_amount+pf.city_paidin_amount+pf.county_paidin_amount+pf.township_paidin_amount) total + FROM + (SELECT ENGINEERING_GRADE, PRO_NO, PRO_CODE, commencement_date FROM bs_sgc_jsjd_bui_pro_info + WHERE CREATE_TIME BETWEEN '2024-01-01' AND '2024-04-01') t + LEFT JOIN bs_slgc_qqjd_spe_pro_proposal pp ON t.PRO_CODE = pp.PROJECT_CODE AND t.PRO_NO = pp.PRO_NO + LEFT JOIN bs_sgc_jsjd_bui_com_acc ca ON ca.PRO_CODE = t.PRO_CODE AND ca.PRO_NO = t.PRO_NO + LEFT JOIN bs_slgc_qqjd_pro_bid_info pbi ON pbi.PROJECT_CODE = t.PRO_CODE AND pbi.PRO_NO = t.PRO_NO + LEFT JOIN bs_sgc_jsjd_bui_source_funds sf ON sf.PRO_CODE = t.PRO_CODE AND sf.PRO_NO = t.PRO_NO + LEFT JOIN bs_sgc_jsjd_bui_cont_info ci ON ci.PRO_CODE = t.PRO_CODE AND ci.PRO_NO = t.PRO_NO + LEFT JOIN bs_sgc_jsjd_bui_purpose_funds pf ON ci.CONTRACT_NUMBER=pf.CONTRACT_NUMBER + GROUP BY t.PRO_CODE + +