Merge branch 'master' of ssh://172.16.8.100:29418/iailab-plat

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/DmModuleController.java

@@ -9,6 +9,7 @@
import com.iailab.module.model.mcs.pre.vo.DmModulePageReqVO;
import com.iailab.module.model.mcs.pre.vo.DmModuleRespVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -33,6 +34,7 @@
     * 管网列表
     */
    @GetMapping("/page")
    @PreAuthorize("@ss.hasPermission('model:pre-module:query')")
    public CommonResult<PageResult<DmModuleRespVO>> page(@Validated DmModulePageReqVO reqVO) {
        PageResult<DmModuleEntity> page = dmModuleService.queryPage(reqVO);

@@ -43,6 +45,7 @@
     * 管网列表
     */
    @GetMapping("/list")
    @PreAuthorize("@ss.hasPermission('model:pre-module:query')")
    public CommonResult<List<DmModuleEntity>> list(@RequestParam Map<String, Object> params) {
        List<DmModuleEntity> list = dmModuleService.list(params);

@@ -53,6 +56,7 @@
     * 管网信息
     */
    @GetMapping("/get/{id}")
    @PreAuthorize("@ss.hasPermission('model:pre-module:query')")
    public CommonResult<DmModuleEntity> info(@PathVariable("id") String id){
        DmModuleEntity info = dmModuleService.selectById(id);

@@ -63,6 +67,7 @@
     * 保存管网
     */
    @PostMapping("/create")
    @PreAuthorize("@ss.hasPermission('model:pre-module:create')")
    public CommonResult<Boolean> save(@RequestBody DmModuleEntity module){
        int count = dmModuleService.check(module);
        if (count > 0) {
@@ -77,6 +82,7 @@
     * 修改管网
     */
    @PutMapping("/update")
    @PreAuthorize("@ss.hasPermission('model:pre-module:update')")
    public CommonResult<Boolean> update(@RequestBody DmModuleEntity module){
        dmModuleService.update(module);
        return success(true);
@@ -86,6 +92,7 @@
     * 删除管网
     */
    @DeleteMapping("/delete")
    @PreAuthorize("@ss.hasPermission('model:pre-module:delete')")
    public CommonResult<Boolean> delete(@RequestParam("id") String id){
        dmModuleService.deleteBatch(new String[]{id});
        return success(true);

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmItemTypeController.java

@@ -8,6 +8,7 @@
import com.iailab.module.model.mcs.pre.vo.MmItemTypePageReqVO;
import com.iailab.module.model.mcs.pre.vo.MmItemTypeRespVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -29,6 +30,7 @@
     * 预测项类型列表
     */
    @GetMapping("/page")
    @PreAuthorize("@ss.hasPermission('model:pre-item:query')")
    public CommonResult<PageResult<MmItemTypeRespVO>> page(@Validated MmItemTypePageReqVO reqVO) {
        PageResult<MmItemTypeEntity> page = mmItemTypeService.page(reqVO);

@@ -39,6 +41,7 @@
     * 预测项类型信息
     */
    @GetMapping("/get/{id}")
    @PreAuthorize("@ss.hasPermission('model:pre-item:query')")
    public CommonResult<MmItemTypeEntity> info(@PathVariable("id") String id) {
        MmItemTypeEntity itemType = mmItemTypeService.selectById(id);

@@ -49,6 +52,7 @@
     * 保存预测项类型
     */
    @PostMapping("/create")
    @PreAuthorize("@ss.hasPermission('model:pre-item:create')")
    public CommonResult<Boolean> save(@RequestBody MmItemTypeEntity itemType) {
        int count = mmItemTypeService.check(itemType);
        if (count > 0) {
@@ -62,6 +66,7 @@
     * 修改预测项类型
     */
    @PutMapping("/update")
    @PreAuthorize("@ss.hasPermission('model:pre-item:update')")
    public CommonResult<Boolean> update(@RequestBody MmItemTypeEntity itemType) {
        int count = mmItemTypeService.check(itemType);
        if (count > 0) {
@@ -75,6 +80,7 @@
     * 删除预测项类型
     */
    @DeleteMapping("/delete")
    @PreAuthorize("@ss.hasPermission('model:pre-item:delete')")
    public CommonResult<Boolean> delete(@RequestParam("id") String id) {
        mmItemTypeService.deleteBatch(new String[]{id});
        return success(true);

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmPredictItemController.java

@@ -7,6 +7,7 @@
import com.iailab.module.model.mcs.pre.vo.CountItemtypeVO;
import com.iailab.module.model.mcs.pre.vo.MmPredictItemRespVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -32,6 +33,7 @@
     * 预测项列表
     */
    @GetMapping("/page")
    @PreAuthorize("@ss.hasPermission('model:pre-predict:query')")
    public CommonResult<PageResult<MmPredictItemRespVO>> page(@RequestParam Map<String, Object> params) {
        PageResult<MmPredictItemRespVO> page = mmPredictItemService.getPageList(params);
        return success(page);
@@ -41,6 +43,7 @@
     * 预测项信息
     */
    @GetMapping("/get/{id}")
    @PreAuthorize("@ss.hasPermission('model:pre-predict:query')")
    public CommonResult<MmPredictItemDTO> info(@PathVariable("id") String id, @RequestParam Map<String, Object> params){
        MmPredictItemDTO predictItem = mmPredictItemService.getDetailById(id, params);
        return success(predictItem);
@@ -50,6 +53,7 @@
     * 保存预测项
     */
    @PostMapping("/create")
    @PreAuthorize("@ss.hasPermission('model:pre-predict:create')")
    public CommonResult<Boolean> save(@RequestBody MmPredictItemDTO mmPredictItemDto){
        int count = mmPredictItemService.check(mmPredictItemDto.getMmPredictItem());
        if (count > 0) {
@@ -63,6 +67,7 @@
     * 修改预测项
     */
    @PutMapping("/update")
    @PreAuthorize("@ss.hasPermission('model:pre-predict:update')")
    public CommonResult<Boolean> update(@RequestBody MmPredictItemDTO mmPredictItemDto){
        int count = mmPredictItemService.check(mmPredictItemDto.getMmPredictItem());
        if (count > 0) {
@@ -76,6 +81,7 @@
     * 删除预测项
     */
    @DeleteMapping("/delete")
    @PreAuthorize("@ss.hasPermission('model:pre-predict:delete')")
    public CommonResult<Boolean> delete(@RequestParam("id") String id) {
        mmPredictItemService.deleteBatch(new String[]{id});
        return success(true);

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmResultTableController.java

@@ -8,6 +8,7 @@
import com.iailab.module.model.mcs.pre.vo.MmItemTypeRespVO;
import com.iailab.module.model.mcs.pre.vo.MmResultTablePageReqVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -29,6 +30,7 @@
     * 结果存放列表
     */
    @GetMapping("/page")
    @PreAuthorize("@ss.hasPermission('model:pre-result:query')")
    public CommonResult<PageResult<MmItemTypeRespVO>> page(@Validated MmResultTablePageReqVO reqVO) {
        PageResult<MmResultTableEntity> page = mmResultTableService.page(reqVO);

@@ -36,6 +38,7 @@
    }

    @GetMapping("/get/{id}")
    @PreAuthorize("@ss.hasPermission('model:pre-result:query')")
    public CommonResult<MmResultTableEntity> info(@PathVariable("id") String id){
        MmResultTableEntity resultTable = mmResultTableService.selectById(id);

@@ -46,6 +49,7 @@
     * 保存结果存放
     */
    @PostMapping("/create")
    @PreAuthorize("@ss.hasPermission('model:pre-result:create')")
    public CommonResult<Boolean> save(@RequestBody MmResultTableEntity resultTable){
        int count = mmResultTableService.check(resultTable);
        if (count > 0) {
@@ -59,6 +63,7 @@
     * 修改结果存放
     */
    @PutMapping("/update")
    @PreAuthorize("@ss.hasPermission('model:pre-result:update')")
    public CommonResult<Boolean> update(@RequestBody MmResultTableEntity resultTable){
        int count = mmResultTableService.check(resultTable);
        if (count > 0) {
@@ -72,6 +77,7 @@
     * 删除结果存放
     */
    @DeleteMapping("/delete")
    @PreAuthorize("@ss.hasPermission('model:pre-result:delete')")
    public CommonResult<Boolean> delete(@RequestParam("id") String id) {
        mmResultTableService.deleteBatch(new String[]{id});
        return success(true);