guoshilong
2023-03-29 309629313429fc64a538f00aab9edb08d853aa36
添加app模块
1 files modified
12 files added
326 ■■■■■ changed files
skjcmanager/skjcmanager-service/pom.xml 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanger-app/pom.xml 31 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/AppApplication.java 16 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/controller/DeviceReportController.java 93 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/entity/DeviceReport.java 79 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/mapper/DeviceReportMapper.java 15 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/mapper/DeviceReportMapper.xml 14 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/service/IDeviceReportService.java 13 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/service/impl/DeviceReportServiceImpl.java 23 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/vo/DeviceReportVO.java 11 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/resources/application-dev.yml 10 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/resources/application-prod.yml 10 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/resources/application-test.yml 10 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/pom.xml
@@ -22,6 +22,7 @@
        <module>skjcmanager-system</module>
        <module>skjcmanager-user</module>
        <module>skjcmanager-sm</module>
        <module>skjcmanger-app</module>
    </modules>
    <dependencies>
skjcmanager/skjcmanager-service/skjcmanger-app/pom.xml
New file
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <artifactId>skjcmanager-service</artifactId>
        <groupId>cn.gistack</groupId>
        <version>3.0.1.RELEASE</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>skjcmanger-app</artifactId>
    <dependencies>
        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-core-cloud</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-core-boot</artifactId>
        </dependency>
        <dependency>
            <groupId>com.github.xiaoymin</groupId>
            <artifactId>knife4j-annotations</artifactId>
            <version>2.0.9</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>
</project>
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/AppApplication.java
New file
@@ -0,0 +1,16 @@
package cn.gistack.app.jcsb;
import org.mybatis.spring.annotation.MapperScan;
import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;
import org.springframework.cloud.openfeign.EnableFeignClients;
@BladeCloudApplication
@EnableFeignClients({"cn.gistack"})
@MapperScan({"org.springblade.**.mapper.**","cn.gistack.**.mapper.**"})
public class AppApplication {
    public static void main(String[] args) {
        BladeApplication.run("blade-app", AppApplication.class, args);
    }
}
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/controller/DeviceReportController.java
New file
@@ -0,0 +1,93 @@
package cn.gistack.app.jcsb.controller;
import cn.gistack.app.jcsb.service.IDeviceReportService;
import cn.gistack.app.jcsb.entity.DeviceReport;
import cn.gistack.app.jcsb.vo.DeviceReportVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
/**
 * 控制器
 *
 */
@RestController
@RequestMapping("deviceReport")
@AllArgsConstructor
@Api(value = "监测上报设备上报", tags = "监测上报设备上报")
public class DeviceReportController extends BladeController {
    private final IDeviceReportService deviceReportService;
    /**
     * 详情
     */
    @GetMapping("/detail")
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "详情", notes = "传入notice")
    public R<DeviceReportVO> detail(DeviceReport deviceReport) {
        DeviceReportVO deviceReportVO = deviceReportService.getDetail(deviceReport);
        return R.data(deviceReportVO);
    }
    /**
     * 多表联合查询自定义分页
     */
    @GetMapping("/page")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入notice")
    public R<IPage<DeviceReportVO>> page(@ApiIgnore DeviceReportVO deviceReportVO, Query query) {
        IPage<DeviceReportVO> pages = deviceReportService.selectDeviceReportPage(Condition.getPage(query), deviceReportVO);
        return null;
    }
    /**
     * 新增
     */
    @PostMapping("/save")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入notice")
    public R save(@RequestBody DeviceReport deviceReport) {
        return R.data(deviceReportService.save(deviceReport));
    }
    /**
     * 修改
     */
    @PostMapping("/update")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入notice")
    public R update(@RequestBody DeviceReport deviceReport) {
        return R.data(deviceReportService.updateById(deviceReport));
    }
    /**
     * 新增或修改
     */
    @PostMapping("/submit")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入notice")
    public R submit(@RequestBody DeviceReport deviceReport) {
        return R.data(deviceReportService.saveOrUpdate(deviceReport));
    }
    /**
     * 删除
     */
    @PostMapping("/remove")
    @ApiOperationSupport(order = 7)
    @ApiOperation(value = "逻辑删除", notes = "传入notice")
    public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
        return R.data(deviceReportService.removeBatchByIds(Func.toLongList(ids)));
    }
}
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/entity/DeviceReport.java
New file
@@ -0,0 +1,79 @@
package cn.gistack.app.jcsb.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@Data
@TableName("JCSB_DEVICE_REPORT")
@EqualsAndHashCode(callSuper = true)
public class DeviceReport extends TenantEntity{
    private static final long serialVersionUID = 1L;
    /**
     * 设备台号
     */
    @ApiModelProperty("设备台号")
    private String deviceCode;
    /**
     * 描述
     */
    @ApiModelProperty("描述")
    private String description;
    /**
     * 设备类型
     */
    @ApiModelProperty("设备类型")
    private String deviceType;
    /**
     * 雨量
     */
    @ApiModelProperty("雨量")
    private String rainfall;
    /**
     * 水位
     */
    @ApiModelProperty("水位")
    private String waterLevel;
    /**
     * 流量
     */
    @ApiModelProperty("流量")
    private String flow;
    /**
     * 蓄水量
     */
    @ApiModelProperty("蓄水量")
    private String waterStorage;
    /**
     * 比讯限
     */
    @ApiModelProperty("比讯限")
    private String specificFloodLimit;
    /**
     * 时段雨量
     */
    @ApiModelProperty("时段雨量")
    private String temporalRainfall;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date recordTime;
}
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/mapper/DeviceReportMapper.java
New file
@@ -0,0 +1,15 @@
package cn.gistack.app.jcsb.mapper;
import cn.gistack.app.jcsb.entity.DeviceReport;
import cn.gistack.app.jcsb.vo.DeviceReportVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
public interface DeviceReportMapper extends BaseMapper<DeviceReport> {
    DeviceReportVO getDetail(DeviceReport deviceReport);
    List<DeviceReportVO> selectDeviceReportPage(IPage<DeviceReportVO> page, DeviceReportVO deviceReportVO);
}
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/mapper/DeviceReportMapper.xml
New file
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.gistack.app.jcsb.mapper.DeviceReportMapper">
    <select id="getDetail" resultType="cn.gistack.app.jcsb.vo.DeviceReportVO">
        SELECT * FROM JCSB_DEVICE_REPORT
    </select>
    <select id="selectDeviceReportPage" resultType="cn.gistack.app.jcsb.vo.DeviceReportVO">
        SELECT id,description,device_code,device_type,rainfall,water_level,flow,water_storage,specific_flood_limit,temporal_rainfall,record_time
        FROM JCSB_DEVICE_REPORT WHERE is_deleted = 0
    </select>
</mapper>
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/service/IDeviceReportService.java
New file
@@ -0,0 +1,13 @@
package cn.gistack.app.jcsb.service;
import cn.gistack.app.jcsb.entity.DeviceReport;
import cn.gistack.app.jcsb.vo.DeviceReportVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.core.mp.base.BaseService;
public interface IDeviceReportService extends BaseService<DeviceReport> {
    DeviceReportVO getDetail(DeviceReport deviceReport);
    IPage<DeviceReportVO> selectDeviceReportPage(IPage<DeviceReportVO> page, DeviceReportVO deviceReportVO);
}
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/service/impl/DeviceReportServiceImpl.java
New file
@@ -0,0 +1,23 @@
package cn.gistack.app.jcsb.service.impl;
import cn.gistack.app.jcsb.mapper.DeviceReportMapper;
import cn.gistack.app.jcsb.entity.DeviceReport;
import cn.gistack.app.jcsb.service.IDeviceReportService;
import cn.gistack.app.jcsb.vo.DeviceReportVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
@Service
public class DeviceReportServiceImpl extends BaseServiceImpl<DeviceReportMapper, DeviceReport> implements IDeviceReportService {
    @Override
    public DeviceReportVO getDetail(DeviceReport deviceReport) {
        return baseMapper.getDetail(deviceReport);
    }
    @Override
    public IPage<DeviceReportVO> selectDeviceReportPage(IPage<DeviceReportVO> page, DeviceReportVO deviceReportVO) {
        return page.setRecords(baseMapper.selectDeviceReportPage(page, deviceReportVO));
    }
}
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/vo/DeviceReportVO.java
New file
@@ -0,0 +1,11 @@
package cn.gistack.app.jcsb.vo;
import cn.gistack.app.jcsb.entity.DeviceReport;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class DeviceReportVO extends DeviceReport {
}
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/resources/application-dev.yml
New file
@@ -0,0 +1,10 @@
#服务器端口
server:
  port: 8111
#数据源配置
spring:
  datasource:
    url: ${blade.datasource.dev.url}
    username: ${blade.datasource.dev.username}
    password: ${blade.datasource.dev.password}
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/resources/application-prod.yml
New file
@@ -0,0 +1,10 @@
#服务器端口
server:
  port: 8111
#数据源配置
spring:
  datasource:
    url: ${blade.datasource.prod.url}
    username: ${blade.datasource.prod.username}
    password: ${blade.datasource.prod.password}
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/resources/application-test.yml
New file
@@ -0,0 +1,10 @@
#服务器端口
server:
  port: 8111
#数据源配置
spring:
  datasource:
    url: ${blade.datasource.test.url}
    username: ${blade.datasource.test.username}
    password: ${blade.datasource.test.password}