Skip to content

G
gassafety-progress
Commit c75faf33 authored by zhangjianqian's avatar zhangjianqian
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents e684eeec 796609fc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8958 additions and 201 deletions
gassafetyprogress-admin/pom.xml
View file @ c75faf33
......@@ -73,6 +73,19 @@
<build>
<finalName>gassafetyprogress-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.1.3.RELEASE</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
......@@ -179,4 +192,4 @@
</build>
</project>
\ No newline at end of file
</project>
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TAirChargeRecordController.java 0 → 100644
View file @ c75faf33
package com.zehong.web.controller.gasBottleTrack;
import java.util.List;
import com.zehong.system.domain.AirChargeOperatorStatistics;
import com.zehong.system.domain.AirChargeStationStatistics;
import com.zehong.system.domain.TGasUserInfo;
import com.zehong.system.domain.vo.AirChargeStatisticsVo;
import org.springframework.security.access.prepost.PreAuthorize;
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.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.enums.BusinessType;
import com.zehong.system.domain.TAirChargeRecord;
import com.zehong.system.service.ITAirChargeRecordService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
/**
* 充装记录Controller
*
* @author zehong
* @date 2023-08-21
*/
@RestController
@RequestMapping("/charge/record")
public class TAirChargeRecordController extends BaseController
{
@Autowired
private ITAirChargeRecordService tAirChargeRecordService;
/**
* 查询充装记录列表
*/
@PreAuthorize("@ss.hasPermi('charge:record:list')")
@GetMapping("/list")
public TableDataInfo list(TAirChargeRecord tAirChargeRecord)
{
startPage();
List<TAirChargeRecord> list = tAirChargeRecordService.selectTAirChargeRecordList(tAirChargeRecord);
return getDataTable(list);
}
/**
* 导出充装记录列表
*/
@PreAuthorize("@ss.hasPermi('charge:record:export')")
@Log(title = "充装记录", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TAirChargeRecord tAirChargeRecord)
{
List<TAirChargeRecord> list = tAirChargeRecordService.selectTAirChargeRecordList(tAirChargeRecord);
ExcelUtil<TAirChargeRecord> util = new ExcelUtil<TAirChargeRecord>(TAirChargeRecord.class);
return util.exportExcel(list, "充装记录数据");
}
/**
* 获取充装记录详细信息
*/
@PreAuthorize("@ss.hasPermi('charge:record:query')")
@GetMapping(value = "/{chargeRecordId}")
public AjaxResult getInfo(@PathVariable("chargeRecordId") Long chargeRecordId)
{
return AjaxResult.success(tAirChargeRecordService.selectTAirChargeRecordById(chargeRecordId));
}
/**
* 新增充装记录
*/
@PreAuthorize("@ss.hasPermi('system:record:add')")
@Log(title = "充装记录", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TAirChargeRecord tAirChargeRecord)
{
return toAjax(tAirChargeRecordService.insertTAirChargeRecord(tAirChargeRecord));
}
/**
* 修改充装记录
*/
@PreAuthorize("@ss.hasPermi('charge:record:edit')")
@Log(title = "充装记录", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TAirChargeRecord tAirChargeRecord)
{
return toAjax(tAirChargeRecordService.updateTAirChargeRecord(tAirChargeRecord));
}
/**
* 删除充装记录
*/
@PreAuthorize("@ss.hasPermi('charge:record:remove')")
@Log(title = "充装记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{chargeRecordIds}")
public AjaxResult remove(@PathVariable Long[] chargeRecordIds)
{
return toAjax(tAirChargeRecordService.deleteTAirChargeRecordByIds(chargeRecordIds));
}
/**
* 充装记录导入
* @param file
* @param updateSupport
* @return
* @throws Exception
*/
@PreAuthorize("@ss.hasPermi('charge:record:import')")
@Log(title = "充装记录导入", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
{
ExcelUtil<TAirChargeRecord> util = new ExcelUtil<>(TAirChargeRecord.class);
List<TAirChargeRecord> airChargeRecordList = util.importExcel(file.getInputStream());
String message = tAirChargeRecordService.importAirChargeRecordInfo(airChargeRecordList, updateSupport);
return AjaxResult.success(message);
}
@GetMapping("/importTemplate")
public AjaxResult importTemplate(){
ExcelUtil<TAirChargeRecord> util = new ExcelUtil<>(TAirChargeRecord.class);
return util.importTemplateExcel("充装记录数据");
}
/**
* 储配站充装统计
* @param airChargeStatisticsVo 统计实体
* @return
*/
@GetMapping("/airChargeStationStatistics")
public TableDataInfo airChargeStationStatistics(AirChargeStatisticsVo airChargeStatisticsVo){
startPage();
return getDataTable(tAirChargeRecordService.airChargeStationStatistics(airChargeStatisticsVo));
}
@GetMapping("/airChargeStationStatisticExport")
public AjaxResult airChargeStationStatisticExport(AirChargeStatisticsVo airChargeStatisticsVo){
List<AirChargeStationStatistics> list = tAirChargeRecordService.airChargeStationStatistics(airChargeStatisticsVo);
ExcelUtil<AirChargeStationStatistics> util = new ExcelUtil<>(AirChargeStationStatistics.class);
return util.exportExcel(list, "充装统计数据");
}
/**
* 充装人员统计
* @param airChargeStatisticsVo 统计
* @return
*/
@GetMapping("/airChargeOperatorStatistics")
public TableDataInfo airChargeOperatorStatistics(AirChargeStatisticsVo airChargeStatisticsVo){
startPage();
return getDataTable(tAirChargeRecordService.airChargeOperatorStatistics(airChargeStatisticsVo));
}
@GetMapping("/airChargeOperatorStatisticsExport")
public AjaxResult airChargeOperatorStatisticsExport(AirChargeStatisticsVo airChargeStatisticsVo){
List<AirChargeOperatorStatistics> list = tAirChargeRecordService.airChargeOperatorStatistics(airChargeStatisticsVo);
ExcelUtil<AirChargeOperatorStatistics> util = new ExcelUtil<>(AirChargeOperatorStatistics.class);
return util.exportExcel(list, "充装统计数据");
}
}
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TGasBottleInfoController.java 0 → 100644
View file @ c75faf33
package com.zehong.web.controller.gasBottleTrack;
import com.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.core.page.TableDataInfo;
import com.zehong.common.enums.BusinessType;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.system.domain.BottleStatistics;
import com.zehong.system.domain.TGasBottleInfo;
import com.zehong.system.service.ITGasBottleInfoService;
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;
import java.util.List;
/**
* 气瓶信息Controller
*
* @author zehong
* @date 2023-08-15
*/
@RestController
@RequestMapping("/gasBottle/info")
public class TGasBottleInfoController extends BaseController
{
@Autowired
private ITGasBottleInfoService tGasBottleInfoService;
/**
* 查询气瓶信息列表
*/
@PreAuthorize("@ss.hasPermi('gasBottle:info:list')")
@GetMapping("/list")
public TableDataInfo list(TGasBottleInfo tGasBottleInfo)
{
startPage();
List<TGasBottleInfo> list = tGasBottleInfoService.selectTGasBottleInfoList(tGasBottleInfo);
return getDataTable(list);
}
@GetMapping("/bottleInfoList")
public AjaxResult bottleInfoList(TGasBottleInfo tGasBottleInfo)
{
List<TGasBottleInfo> list = tGasBottleInfoService.selectTGasBottleInfoList(tGasBottleInfo);
return AjaxResult.success(list);
}
/**
* 导出气瓶信息列表
*/
@PreAuthorize("@ss.hasPermi('gasBottle:info:export')")
@Log(title = "气瓶信息", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TGasBottleInfo tGasBottleInfo)
{
List<TGasBottleInfo> list = tGasBottleInfoService.selectTGasBottleInfoList(tGasBottleInfo);
ExcelUtil<TGasBottleInfo> util = new ExcelUtil<TGasBottleInfo>(TGasBottleInfo.class);
return util.exportExcel(list, "气瓶信息数据");
}
/**
* 获取气瓶信息详细信息
*/
@PreAuthorize("@ss.hasPermi('gasBottle:info:query')")
@GetMapping(value = "/{bottleId}")
public AjaxResult getInfo(@PathVariable("bottleId") Long bottleId)
{
return AjaxResult.success(tGasBottleInfoService.selectTGasBottleInfoById(bottleId));
}
/**
* 新增气瓶信息
*/
@PreAuthorize("@ss.hasPermi('gasBottle:info:add')")
@Log(title = "气瓶信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TGasBottleInfo tGasBottleInfo)
{
return toAjax(tGasBottleInfoService.insertTGasBottleInfo(tGasBottleInfo));
}
/**
* 修改气瓶信息
*/
@PreAuthorize("@ss.hasPermi('gasBottle:info:edit')")
@Log(title = "气瓶信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TGasBottleInfo tGasBottleInfo)
{
return toAjax(tGasBottleInfoService.updateTGasBottleInfo(tGasBottleInfo));
}
/**
* 删除气瓶信息
*/
@PreAuthorize("@ss.hasPermi('gasBottle:info:remove')")
@Log(title = "气瓶信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{bottleIds}")
public AjaxResult remove(@PathVariable Long[] bottleIds)
{
return toAjax(tGasBottleInfoService.deleteTGasBottleInfoByIds(bottleIds));
}
/**
* 气瓶导入
* @param file
* @param updateSupport
* @return
* @throws Exception
*/
@PreAuthorize("@ss.hasPermi('gasBottle:info:import')")
@Log(title = "气瓶导入", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
{
ExcelUtil<TGasBottleInfo> util = new ExcelUtil<>(TGasBottleInfo.class);
List<TGasBottleInfo> tGasBottleInfoList = util.importExcel(file.getInputStream());
String message = tGasBottleInfoService.importTGasBottleInfo(tGasBottleInfoList, updateSupport);
return AjaxResult.success(message);
}
@GetMapping("/importTemplate")
public AjaxResult importTemplate(){
ExcelUtil<TGasBottleInfo> util = new ExcelUtil<>(TGasBottleInfo.class);
return util.importTemplateExcel("气瓶数据");
}
@GetMapping("/bottleStatistics")
public TableDataInfo bottleStatistics(@RequestParam(value="stationId",required = false) Long stationId){
startPage();
return getDataTable(tGasBottleInfoService.bottleStatistics(stationId));
}
@GetMapping("/bottleStatisticsExport")
public AjaxResult bottleStatisticsExport(@RequestParam(value = "stationId",required = false) Long stationId)
{
List<BottleStatistics> statistics = tGasBottleInfoService.bottleStatistics(stationId);
ExcelUtil<BottleStatistics> util = new ExcelUtil<>(BottleStatistics.class);
return util.exportExcel(statistics, "气瓶信息数据");
}
}
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TGasBottleTrackRecordController.java 0 → 100644
View file @ c75faf33
package com.zehong.web.controller.gasBottleTrack;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.enums.BusinessType;
import com.zehong.system.domain.TGasBottleTrackRecord;
import com.zehong.system.service.ITGasBottleTrackRecordService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
/**
* 气瓶追溯Controller
*
* @author zehong
* @date 2023-08-18
*/
@RestController
@RequestMapping("/track/record")
public class TGasBottleTrackRecordController extends BaseController
{
@Autowired
private ITGasBottleTrackRecordService tGasBottleTrackRecordService;
/**
* 查询气瓶追溯列表
*/
@PreAuthorize("@ss.hasPermi('track:record:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody TGasBottleTrackRecord tGasBottleTrackRecord)
{
startPage();
List<TGasBottleTrackRecord> list = tGasBottleTrackRecordService.selectTGasBottleTrackRecordList(tGasBottleTrackRecord);
return getDataTable(list);
}
@PostMapping("/bottleTrackRecordList")
public AjaxResult bottleTrackRecordList(@RequestBody TGasBottleTrackRecord tGasBottleTrackRecord)
{
List<TGasBottleTrackRecord> list = tGasBottleTrackRecordService.selectTGasBottleTrackRecordList(tGasBottleTrackRecord);
return AjaxResult.success(list);
}
/**
* 导出气瓶追溯列表
*/
@PreAuthorize("@ss.hasPermi('track:record:export')")
@Log(title = "气瓶追溯", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public AjaxResult export(@RequestBody TGasBottleTrackRecord tGasBottleTrackRecord)
{
List<TGasBottleTrackRecord> list = tGasBottleTrackRecordService.selectTGasBottleTrackRecordList(tGasBottleTrackRecord);
ExcelUtil<TGasBottleTrackRecord> util = new ExcelUtil<TGasBottleTrackRecord>(TGasBottleTrackRecord.class);
return util.exportExcel(list, "气瓶追溯数据");
}
/**
* 获取气瓶追溯详细信息
*/
@PreAuthorize("@ss.hasPermi('track:record:query')")
@GetMapping(value = "/{trackRecordId}")
public AjaxResult getInfo(@PathVariable("trackRecordId") Long trackRecordId)
{
return AjaxResult.success(tGasBottleTrackRecordService.selectTGasBottleTrackRecordById(trackRecordId));
}
/**
* 新增气瓶追溯
*/
@PreAuthorize("@ss.hasPermi('track:record:add')")
@Log(title = "气瓶追溯", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TGasBottleTrackRecord tGasBottleTrackRecord)
{
return toAjax(tGasBottleTrackRecordService.insertTGasBottleTrackRecord(tGasBottleTrackRecord));
}
/**
* 修改气瓶追溯
*/
@PreAuthorize("@ss.hasPermi('track:record:edit')")
@Log(title = "气瓶追溯", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TGasBottleTrackRecord tGasBottleTrackRecord)
{
return toAjax(tGasBottleTrackRecordService.updateTGasBottleTrackRecord(tGasBottleTrackRecord));
}
/**
* 删除气瓶追溯
*/
@PreAuthorize("@ss.hasPermi('track:record:remove')")
@Log(title = "气瓶追溯", businessType = BusinessType.DELETE)
@DeleteMapping("/{trackRecordIds}")
public AjaxResult remove(@PathVariable Long[] trackRecordIds)
{
return toAjax(tGasBottleTrackRecordService.deleteTGasBottleTrackRecordByIds(trackRecordIds));
}
}
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TGasStorageStationInfoController.java 0 → 100644
View file @ c75faf33
package com.zehong.web.controller.gasBottleTrack;
import com.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.core.page.TableDataInfo;
import com.zehong.common.enums.BusinessType;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.system.domain.BaseInfoStatistics;
import com.zehong.system.domain.TGasStorageStationInfo;
import com.zehong.system.service.ITGasStorageStationInfoService;
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;
import java.util.List;
/**
* 储配站信息Controller
*
* @author zehong
* @date 2023-08-14
*/
@RestController
@RequestMapping("/gasBottleTrack/storageStationManage")
public class TGasStorageStationInfoController extends BaseController
{
@Autowired
private ITGasStorageStationInfoService tGasStorageStationInfoService;
/**
* 查询储配站信息列表
*/
@PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage:list')")
@GetMapping("/list")
public TableDataInfo list(TGasStorageStationInfo tGasStorageStationInfo)
{
startPage();
List<TGasStorageStationInfo> list = tGasStorageStationInfoService.selectTGasStorageStationInfoList(tGasStorageStationInfo);
return getDataTable(list);
}
@GetMapping("/gasStorageStationList")
public AjaxResult gasStorageStationList(TGasStorageStationInfo tGasStorageStationInfo){
List<TGasStorageStationInfo> list = tGasStorageStationInfoService.selectTGasStorageStationInfoList(tGasStorageStationInfo);
return AjaxResult.success(list);
}
/**
* 导出储配站信息列表
*/
@PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage::export')")
@Log(title = "储配站信息", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TGasStorageStationInfo tGasStorageStationInfo)
{
List<TGasStorageStationInfo> list = tGasStorageStationInfoService.selectTGasStorageStationInfoList(tGasStorageStationInfo);
ExcelUtil<TGasStorageStationInfo> util = new ExcelUtil<TGasStorageStationInfo>(TGasStorageStationInfo.class);
return util.exportExcel(list, "储配站信息数据");
}
/**
* 获取储配站信息详细信息
*/
@PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage:query')")
@GetMapping(value = "/{stationId}")
public AjaxResult getInfo(@PathVariable("stationId") Long stationId)
{
return AjaxResult.success(tGasStorageStationInfoService.selectTGasStorageStationInfoById(stationId));
}
/**
* 新增储配站信息
*/
@PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage:add')")
@Log(title = "储配站信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TGasStorageStationInfo tGasStorageStationInfo)
{
return toAjax(tGasStorageStationInfoService.insertTGasStorageStationInfo(tGasStorageStationInfo));
}
/**
* 修改储配站信息
*/
@PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage:edit')")
@Log(title = "储配站信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TGasStorageStationInfo tGasStorageStationInfo)
{
return toAjax(tGasStorageStationInfoService.updateTGasStorageStationInfo(tGasStorageStationInfo));
}
/**
* 删除储配站信息
*/
@PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage:remove')")
@Log(title = "储配站信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{stationIds}")
public AjaxResult remove(@PathVariable Long[] stationIds)
{
return toAjax(tGasStorageStationInfoService.deleteTGasStorageStationInfoByIds(stationIds));
}
/**
* 储配站导入
* @param file
* @param updateSupport
* @return
* @throws Exception
*/
@PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage:import')")
@Log(title = "储配站维护", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
{
ExcelUtil<TGasStorageStationInfo> util = new ExcelUtil<>(TGasStorageStationInfo.class);
List<TGasStorageStationInfo> tGasStorageStationInfoList = util.importExcel(file.getInputStream());
String message = tGasStorageStationInfoService.importTGasStorageStationInfo(tGasStorageStationInfoList, updateSupport);
return AjaxResult.success(message);
}
@GetMapping("/importTemplate")
public AjaxResult importTemplate(){
ExcelUtil<TGasStorageStationInfo> util = new ExcelUtil<>(TGasStorageStationInfo.class);
return util.importTemplateExcel("储配站数据");
}
/**
* 基础信息统计
* @param stationId 储配站id
* @return
*/
@GetMapping("/baseInfoStatistics")
public TableDataInfo baseInfoStatistics(@RequestParam(value = "stationId",required = false) Long stationId){
startPage();
return getDataTable(tGasStorageStationInfoService.baseInfoStatistics(stationId));
}
@GetMapping("/baseInfoStatisticsExport")
public AjaxResult baseInfoStatisticsExport(@RequestParam(value = "stationId",required = false) Long stationId)
{
List<BaseInfoStatistics> statistics = tGasStorageStationInfoService.baseInfoStatistics(stationId);
ExcelUtil<BaseInfoStatistics> util = new ExcelUtil<>(BaseInfoStatistics.class);
return util.exportExcel(statistics, "基础信息数据");
}
}
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TGasUserInfoController.java 0 → 100644
View file @ c75faf33
package com.zehong.web.controller.gasBottleTrack;
import java.util.List;
import com.zehong.system.domain.TGasBottleInfo;
import org.springframework.security.access.prepost.PreAuthorize;
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.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.enums.BusinessType;
import com.zehong.system.domain.TGasUserInfo;
import com.zehong.system.service.ITGasUserInfoService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
/**
* 燃气用户Controller
*
* @author zehong
* @date 2023-08-17
*/
@RestController
@RequestMapping("/gasUser/info")
public class TGasUserInfoController extends BaseController
{
@Autowired
private ITGasUserInfoService tGasUserInfoService;
/**
* 查询燃气用户列表
*/
@PreAuthorize("@ss.hasPermi('gasUser:info:list')")
@GetMapping("/list")
public TableDataInfo list(TGasUserInfo tGasUserInfo)
{
startPage();
List<TGasUserInfo> list = tGasUserInfoService.selectTGasUserInfoList(tGasUserInfo);
return getDataTable(list);
}
@GetMapping("/gasUserInfoList")
public AjaxResult gasUserInfoList(TGasUserInfo tGasUserInfo){
List<TGasUserInfo> list = tGasUserInfoService.selectTGasUserInfoList(tGasUserInfo);
return AjaxResult.success(list);
}
/**
* 导出燃气用户列表
*/
@PreAuthorize("@ss.hasPermi('gasUser:info:export')")
@Log(title = "燃气用户", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TGasUserInfo tGasUserInfo)
{
List<TGasUserInfo> list = tGasUserInfoService.selectTGasUserInfoList(tGasUserInfo);
ExcelUtil<TGasUserInfo> util = new ExcelUtil<TGasUserInfo>(TGasUserInfo.class);
return util.exportExcel(list, "燃气用户数据");
}
/**
* 获取燃气用户详细信息
*/
@PreAuthorize("@ss.hasPermi('gasUser:info:query')")
@GetMapping(value = "/{gasUserId}")
public AjaxResult getInfo(@PathVariable("gasUserId") Long gasUserId)
{
return AjaxResult.success(tGasUserInfoService.selectTGasUserInfoById(gasUserId));
}
/**
* 新增燃气用户
*/
@PreAuthorize("@ss.hasPermi('gasUser:info:add')")
@Log(title = "燃气用户", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TGasUserInfo tGasUserInfo)
{
return toAjax(tGasUserInfoService.insertTGasUserInfo(tGasUserInfo));
}
/**
* 修改燃气用户
*/
@PreAuthorize("@ss.hasPermi('gasUser:info:edit')")
@Log(title = "燃气用户", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TGasUserInfo tGasUserInfo)
{
return toAjax(tGasUserInfoService.updateTGasUserInfo(tGasUserInfo));
}
/**
* 删除燃气用户
*/
@PreAuthorize("@ss.hasPermi('gasUser:info:remove')")
@Log(title = "燃气用户", businessType = BusinessType.DELETE)
@DeleteMapping("/{gasUserIds}")
public AjaxResult remove(@PathVariable Long[] gasUserIds)
{
return toAjax(tGasUserInfoService.deleteTGasUserInfoByIds(gasUserIds));
}
/**
* 燃气用户导入
* @param file
* @param updateSupport
* @return
* @throws Exception
*/
@PreAuthorize("@ss.hasPermi('gasUser:info:import')")
@Log(title = "燃气用户导入", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
{
ExcelUtil<TGasUserInfo> util = new ExcelUtil<>(TGasUserInfo.class);
List<TGasUserInfo> tGasUserInfoList = util.importExcel(file.getInputStream());
String message = tGasUserInfoService.importTGasUserInfo(tGasUserInfoList, updateSupport);
return AjaxResult.success(message);
}
@GetMapping("/importTemplate")
public AjaxResult importTemplate(){
ExcelUtil<TGasUserInfo> util = new ExcelUtil<>(TGasUserInfo.class);
return util.importTemplateExcel("燃气用户数据");
}
}
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TPractitionerInfoController.java 0 → 100644
View file @ c75faf33
package com.zehong.web.controller.gasBottleTrack;
import java.util.List;
import com.zehong.system.domain.TGasBottleInfo;
import org.springframework.security.access.prepost.PreAuthorize;
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.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.enums.BusinessType;
import com.zehong.system.domain.TPractitionerInfo;
import com.zehong.system.service.ITPractitionerInfoService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
/**
* 从业人员信息Controller
*
* @author zehong
* @date 2023-08-16
*/
@RestController
@RequestMapping("/practitioner/info")
public class TPractitionerInfoController extends BaseController
{
@Autowired
private ITPractitionerInfoService tPractitionerInfoService;
/**
* 查询从业人员信息列表
*/
@PreAuthorize("@ss.hasPermi('practitioner:info:list')")
@GetMapping("/list")
public TableDataInfo list(TPractitionerInfo tPractitionerInfo)
{
startPage();
List<TPractitionerInfo> list = tPractitionerInfoService.selectTPractitionerInfoList(tPractitionerInfo);
return getDataTable(list);
}
@GetMapping("/practitionerInfoList")
public AjaxResult practitionerInfoList(TPractitionerInfo tPractitionerInfo)
{
List<TPractitionerInfo> list = tPractitionerInfoService.selectTPractitionerInfoList(tPractitionerInfo);
return AjaxResult.success(list);
}
/**
* 导出从业人员信息列表
*/
@PreAuthorize("@ss.hasPermi('practitioner:info:export')")
@Log(title = "从业人员信息", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TPractitionerInfo tPractitionerInfo)
{
List<TPractitionerInfo> list = tPractitionerInfoService.selectTPractitionerInfoList(tPractitionerInfo);
ExcelUtil<TPractitionerInfo> util = new ExcelUtil<TPractitionerInfo>(TPractitionerInfo.class);
return util.exportExcel(list, "从业人员信息数据");
}
/**
* 获取从业人员信息详细信息
*/
@PreAuthorize("@ss.hasPermi('practitioner:info:query')")
@GetMapping(value = "/{practitionerId}")
public AjaxResult getInfo(@PathVariable("practitionerId") Long practitionerId)
{
return AjaxResult.success(tPractitionerInfoService.selectTPractitionerInfoById(practitionerId));
}
/**
* 新增从业人员信息
*/
@PreAuthorize("@ss.hasPermi('practitioner:info:add')")
@Log(title = "从业人员信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TPractitionerInfo tPractitionerInfo)
{
return toAjax(tPractitionerInfoService.insertTPractitionerInfo(tPractitionerInfo));
}
/**
* 修改从业人员信息
*/
@PreAuthorize("@ss.hasPermi('practitioner:info:edit')")
@Log(title = "从业人员信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TPractitionerInfo tPractitionerInfo)
{
return toAjax(tPractitionerInfoService.updateTPractitionerInfo(tPractitionerInfo));
}
/**
* 删除从业人员信息
*/
@PreAuthorize("@ss.hasPermi('practitioner:info:remove')")
@Log(title = "从业人员信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{practitionerIds}")
public AjaxResult remove(@PathVariable Long[] practitionerIds)
{
return toAjax(tPractitionerInfoService.deleteTPractitionerInfoByIds(practitionerIds));
}
/**
* 从业人员导入
* @param file
* @param updateSupport
* @return
* @throws Exception
*/
@PreAuthorize("@ss.hasPermi('practitioner:info:import')")
@Log(title = "从业人员导入", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
{
ExcelUtil<TPractitionerInfo> util = new ExcelUtil<>(TPractitionerInfo.class);
List<TPractitionerInfo> tPractitionerInfo = util.importExcel(file.getInputStream());
String message = tPractitionerInfoService.importTPractitionerInfo(tPractitionerInfo, updateSupport);
return AjaxResult.success(message);
}
@GetMapping("/importTemplate")
public AjaxResult importTemplate(){
ExcelUtil<TPractitionerInfo> util = new ExcelUtil<>(TPractitionerInfo.class);
return util.importTemplateExcel("从业人员数据");
}
}
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TSafeCheckRecordController.java 0 → 100644
View file @ c75faf33
package com.zehong.web.controller.gasBottleTrack;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
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.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.enums.BusinessType;
import com.zehong.system.domain.TSafeCheckRecord;
import com.zehong.system.service.ITSafeCheckRecordService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
/**
* 安检记录Controller
*
* @author zehong
* @date 2023-08-21
*/
@RestController
@RequestMapping("/safe/record")
public class TSafeCheckRecordController extends BaseController
{
@Autowired
private ITSafeCheckRecordService tSafeCheckRecordService;
/**
* 查询安检记录列表
*/
@PreAuthorize("@ss.hasPermi('safe:record:list')")
@GetMapping("/list")
public TableDataInfo list(TSafeCheckRecord tSafeCheckRecord)
{
startPage();
List<TSafeCheckRecord> list = tSafeCheckRecordService.selectTSafeCheckRecordList(tSafeCheckRecord);
return getDataTable(list);
}
/**
* 导出安检记录列表
*/
@PreAuthorize("@ss.hasPermi('safe:record:export')")
@Log(title = "安检记录", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TSafeCheckRecord tSafeCheckRecord)
{
List<TSafeCheckRecord> list = tSafeCheckRecordService.selectTSafeCheckRecordList(tSafeCheckRecord);
ExcelUtil<TSafeCheckRecord> util = new ExcelUtil<TSafeCheckRecord>(TSafeCheckRecord.class);
return util.exportExcel(list, "安检记录数据");
}
/**
* 获取安检记录详细信息
*/
@PreAuthorize("@ss.hasPermi('safe:record:query')")
@GetMapping(value = "/{safeCheckId}")
public AjaxResult getInfo(@PathVariable("safeCheckId") Long safeCheckId)
{
return AjaxResult.success(tSafeCheckRecordService.selectTSafeCheckRecordById(safeCheckId));
}
/**
* 新增安检记录
*/
@PreAuthorize("@ss.hasPermi('safe:record:add')")
@Log(title = "安检记录", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TSafeCheckRecord tSafeCheckRecord)
{
return toAjax(tSafeCheckRecordService.insertTSafeCheckRecord(tSafeCheckRecord));
}
/**
* 修改安检记录
*/
@PreAuthorize("@ss.hasPermi('safe:record:edit')")
@Log(title = "安检记录", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TSafeCheckRecord tSafeCheckRecord)
{
return toAjax(tSafeCheckRecordService.updateTSafeCheckRecord(tSafeCheckRecord));
}
/**
* 删除安检记录
*/
@PreAuthorize("@ss.hasPermi('safe:record:remove')")
@Log(title = "安检记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{safeCheckIds}")
public AjaxResult remove(@PathVariable Long[] safeCheckIds)
{
return toAjax(tSafeCheckRecordService.deleteTSafeCheckRecordByIds(safeCheckIds));
}
}
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/operationMonitor/TVehicleInfoController.java
View file @ c75faf33
......@@ -19,7 +19,7 @@ import com.zehong.common.core.page.TableDataInfo;
/**
* 燃气车辆信息Controller
*
*
* @author zehong
* @date 2022-03-17
*/
......@@ -33,6 +33,9 @@ public class TVehicleInfoController extends BaseController
@Autowired
private ITVehicleLocationInfoService itVehicleLocationInfoService;
@Autowired
private ITVehicleLocationInfoService tVehicleLocationInfoService;
/**
* 查询燃气车辆信息列表
*/
......@@ -80,6 +83,8 @@ public class TVehicleInfoController extends BaseController
return util.exportExcel(list, "燃气车辆信息数据");
}
/**
* 获取燃气车辆信息详细信息
*/
......
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/standingBook/THiddenDangerStandingBookController.java
View file @ c75faf33
package com.zehong.web.controller.standingBook;
import java.util.ArrayList;
import java.util.List;
import com.zehong.system.domain.Statistics;
import com.zehong.system.domain.form.THiddenDangerStandingBookForm;
import com.zehong.web.controller.tool.TimeConfig;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -24,7 +27,7 @@ import com.zehong.common.core.page.TableDataInfo;
/**
* 隐患整治台账Controller
*
*
* @author zehong
* @date 2022-02-09
*/
......@@ -47,6 +50,44 @@ public class THiddenDangerStandingBookController extends BaseController
return getDataTable(list);
}
/**
* 获取隐患整治台账统计信息
*/
@GetMapping("/hazardStatistics")
public AjaxResult hazardStatistics()
{
//生成近7天数据
List<String> sevenDate = TimeConfig.getSevenDate();
List<Statistics> list=new ArrayList<>();
//查询统计日期和数量
List<Statistics> statistics = tHiddenDangerStandingBookService.hazardStatistics(TimeConfig.getSevenDate());
if (statistics.size()==0){
for (int n=0;n<7;n++){
Statistics statisticsn=new Statistics();
statisticsn.setCount(0);
statisticsn.setDate(sevenDate.get(n));
list.add(statisticsn);
}
}
for (int s=0;s<statistics.size();s++){
for (int i=0;i<sevenDate.size();i++){
Statistics statistics1=new Statistics();
if (statistics.get(s).getDate().equals(sevenDate.get(i))){
statistics1.setCount(statistics.get(s).getCount());
statistics1.setDate(sevenDate.get(i));
list.add(statistics1);
}else {
statistics1.setCount(0);
statistics1.setDate(sevenDate.get(i));
list.add(statistics1);
}
}
}
return AjaxResult.success(list);
}
/**
* 导出隐患整治台账列表
*/
......
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/standingBook/TTroubleStandingBookController.java
View file @ c75faf33
package com.zehong.web.controller.standingBook;
import java.util.ArrayList;
import java.util.List;
import com.zehong.system.domain.Statistics;
import com.zehong.system.domain.form.TTroubleStandingBookForm;
import com.zehong.web.controller.tool.TimeConfig;
import com.zehong.web.timeconfig.TimeConFig;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -24,7 +28,7 @@ import com.zehong.common.core.page.TableDataInfo;
/**
* 事故台账Controller
*
*
* @author zehong
* @date 2022-02-09
*/
......@@ -47,6 +51,43 @@ public class TTroubleStandingBookController extends BaseController
return getDataTable(list);
}
/**
* 获取事故台账统计
*/
@GetMapping("/accidentLedger")
public AjaxResult accidentLedger()
{
List<Statistics> list=new ArrayList<>();
//查询统计日期和数量
List<Statistics> statistics = tTroubleStandingBookService.accidentLedger(TimeConfig.getSevenDate());
//生成近7天数据
List<String> sevenDate = TimeConfig.getSevenDate();
if (statistics.size()==0){
for (int n=0;n<7;n++){
Statistics statisticsn=new Statistics();
statisticsn.setCount(0);
statisticsn.setDate(sevenDate.get(n));
list.add(statisticsn);
}
}
for (int s=0;s<statistics.size();s++){
for (int i=0;i<sevenDate.size();i++){
Statistics statistics1=new Statistics();
if (statistics.get(s).getDate().equals(sevenDate.get(i))){
statistics1.setCount(statistics.get(s).getCount());
statistics1.setDate(sevenDate.get(i));
list.add(statistics1);
}else {
statistics1.setCount(0);
statistics1.setDate(sevenDate.get(i));
list.add(statistics1);
}
}
}
return AjaxResult.success(list);
}
/**
* 导出事故台账列表
*/
......
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/PipeInterfaceController.java
View file @ c75faf33
......@@ -37,14 +37,14 @@ public class PipeInterfaceController extends BaseController {
//循环根据权属单位名称分组的数据
for (int i=0;i<pipeDatesGroup.size();i++){
//循环全部数据
for (int n=0;n<pipeDates.size();n++){
//判断如果名称一样就一组
if (pipeDatesGroup.get(i).getPowerCompany().equals(pipeDates.get(n).getPowerCompany())){
// //设置分组类型
// pipeDates.get(n).setCompanyType(Integer.parseInt(pipeDates.get(n).getPipeId()));
pipeDates.get(n).setIconType(1);
}
}
// for (int n=0;n<pipeDates.size();n++){
// //判断如果名称一样就一组
// if (pipeDatesGroup.get(i).getPowerCompany().equals(pipeDates.get(n).getPowerCompany())){
//// //设置分组类型
//// pipeDates.get(n).setCompanyType(Integer.parseInt(pipeDates.get(n).getPipeId()));
// pipeDates.get(n).setIconType(1);
// }
// }
k++;
}
PipeList pipeList=new PipeList();
......
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TDetectorUserController.java
View file @ c75faf33
......@@ -51,6 +51,17 @@ public class TDetectorUserController extends BaseController
return getDataTable(list);
}
/**
* 获取燃气用户统计信息
*/
@GetMapping("/userStatistics")
public AjaxResult userStatistics()
{
return AjaxResult.success(tDetectorUserService.userStatistics());
}
/**
* 获取探测器用户列表
* @return
......
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TEnterpriseInfoController.java
View file @ c75faf33
......@@ -49,6 +49,16 @@ public class TEnterpriseInfoController extends BaseController
return getDataTable(list);
}
/**
* 查询企业类型
* @return
*/
// @RequestMapping("/getEnterpriseType")
// public TableDataInfo getEnterpriseType(){
// List<TEnterpriseInfo> enterpriseType = tEnterpriseInfoService.getEnterpriseType();
// return getDataTable(enterpriseType);
// }
/**
*查询所有企业信息
* @param tEnterpriseInfo
......
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/system/SysLoginController.java
View file @ c75faf33
package com.zehong.web.controller.system;
import java.util.HashMap;
import java.util.List;
import java.util.Set;
import com.zehong.framework.systemsetting.SystemSetting;
import com.zehong.framework.web.domain.server.Sys;
import com.zehong.system.service.ISysPostService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -24,7 +26,7 @@ import com.zehong.system.service.ISysMenuService;
/**
* 登录验证
*
*
* @author zehong
*/
@RestController
......@@ -50,7 +52,7 @@ public class SysLoginController
/**
* 登录方法
*
*
* @param loginBody 登录信息
* @return 结果
*/
......@@ -67,7 +69,7 @@ public class SysLoginController
/**
* 获取用户信息
*
*
* @return 用户信息
*/
@GetMapping("getInfo")
......@@ -79,18 +81,21 @@ public class SysLoginController
Set<String> roles = permissionService.getRolePermission(user);
// 权限集合
Set<String> permissions = permissionService.getMenuPermission(user);
HashMap hashMap=new HashMap();
hashMap.put("map_center","[118.168541,39.838353]");
hashMap.put("prod_test","prod");
AjaxResult ajax = AjaxResult.success();
ajax.put("user", user);
ajax.put("roles", roles);
ajax.put("permissions", permissions);
ajax.put("systemSetting",systemSetting.getSystemWebSetting());
ajax.put("systemSetting",hashMap);
ajax.put("posts",iSysPostService.getPostListByUserId(user.getUserId()));
return ajax;
}
/**
* 获取路由信息
*
*
* @return 路由信息
*/
@GetMapping("getRouters")
......
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/system/TDeliveryRecordController.java 0 → 100644
View file @ c75faf33
package com.zehong.web.controller.system;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
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.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.enums.BusinessType;
import com.zehong.system.domain.TDeliveryRecord;
import com.zehong.system.service.ITDeliveryRecordService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
/**
* 配送记录Controller
*
* @author zehong
* @date 2023-08-22
*/
@RestController
@RequestMapping("/system/recordn")
public class TDeliveryRecordController extends BaseController
{
@Autowired
private ITDeliveryRecordService tDeliveryRecordService;
/**
* 查询配送记录列表
*/
@PreAuthorize("@ss.hasPermi('system:record:list')")
@GetMapping("/list")
public TableDataInfo list(TDeliveryRecord tDeliveryRecord)
{
startPage();
List<TDeliveryRecord> list = tDeliveryRecordService.selectTDeliveryRecordList(tDeliveryRecord);
return getDataTable(list);
}
/**
* 导出配送记录列表
*/
@PreAuthorize("@ss.hasPermi('system:record:export')")
@Log(title = "配送记录", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TDeliveryRecord tDeliveryRecord)
{
List<TDeliveryRecord> list = tDeliveryRecordService.selectTDeliveryRecordList(tDeliveryRecord);
ExcelUtil<TDeliveryRecord> util = new ExcelUtil<TDeliveryRecord>(TDeliveryRecord.class);
return util.exportExcel(list, "配送记录数据");
}
/**
* 获取配送记录详细信息
*/
@PreAuthorize("@ss.hasPermi('system:record:query')")
@GetMapping(value = "/{deliveryRecordId}")
public AjaxResult getInfo(@PathVariable("deliveryRecordId") Long deliveryRecordId)
{
return AjaxResult.success(tDeliveryRecordService.selectTDeliveryRecordById(deliveryRecordId));
}
/**
* 新增配送记录
*/
@PreAuthorize("@ss.hasPermi('system:record:add')")
@Log(title = "配送记录", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TDeliveryRecord tDeliveryRecord)
{
return toAjax(tDeliveryRecordService.insertTDeliveryRecord(tDeliveryRecord));
}
/**
* 修改配送记录
*/
@PreAuthorize("@ss.hasPermi('system:record:edit')")
@Log(title = "配送记录", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TDeliveryRecord tDeliveryRecord)
{
return toAjax(tDeliveryRecordService.updateTDeliveryRecord(tDeliveryRecord));
}
/**
* 删除配送记录
*/
@PreAuthorize("@ss.hasPermi('system:record:remove')")
@Log(title = "配送记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{deliveryRecordIds}")
public AjaxResult remove(@PathVariable Long[] deliveryRecordIds)
{
return toAjax(tDeliveryRecordService.deleteTDeliveryRecordByIds(deliveryRecordIds));
}
}
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/system/TVehicleInfosController.java 0 → 100644
View file @ c75faf33
package com.zehong.web.controller.system;
import java.util.List;
import com.zehong.system.domain.TVehicleLocationInfo;
import com.zehong.system.service.ITVehicleLocationInfoService;
import io.jsonwebtoken.lang.Collections;
import org.springframework.security.access.prepost.PreAuthorize;
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.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.enums.BusinessType;
import com.zehong.system.domain.TVehicleInfo;
import com.zehong.system.service.ITVehicleInfoService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
/**
* 燃气车辆信息Controller
*
* @author zehong
* @date 2023-08-16
*/
@RestController
@RequestMapping("/system/infos")
public class TVehicleInfosController extends BaseController
{
@Autowired
private ITVehicleInfoService tVehicleInfoService;
@Autowired
private ITVehicleLocationInfoService itVehicleLocationInfoService;
/**
* 查询燃气车辆信息列表
*/
@PreAuthorize("@ss.hasPermi('system:info:list')")
@GetMapping("/list")
public TableDataInfo list(TVehicleInfo tVehicleInfo)
{
startPage();
List<TVehicleInfo> list = tVehicleInfoService.selectTVehicleInfoList(tVehicleInfo);
for (int i=0;i<list.size();i++){
//获取最后位置信息
TVehicleLocationInfo tVehicleLocationInfo = new TVehicleLocationInfo();
tVehicleLocationInfo.setCarNum(list.get(i).getCarNum());
tVehicleLocationInfo.setLast(true);
List<TVehicleLocationInfo> tVehicleLocationInfoList=itVehicleLocationInfoService.selectTVehicleLocationInfoList(tVehicleLocationInfo);
//车辆最后位置
if(!Collections.isEmpty(tVehicleLocationInfoList) && tVehicleLocationInfoList.size() > 0){
list.get(i).setLongitude(tVehicleLocationInfoList.get(0).getLongitude());
list.get(i).setLatitude(tVehicleLocationInfoList.get(0).getLatitude());
}
}
return getDataTable(list);
}
/**
* 导出燃气车辆信息列表
*/
@PreAuthorize("@ss.hasPermi('system:info:export')")
@Log(title = "燃气车辆信息", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TVehicleInfo tVehicleInfo)
{
List<TVehicleInfo> list = tVehicleInfoService.selectTVehicleInfoList(tVehicleInfo);
ExcelUtil<TVehicleInfo> util = new ExcelUtil<TVehicleInfo>(TVehicleInfo.class);
return util.exportExcel(list, "燃气车辆信息数据");
}
/**
* 获取燃气车辆信息详细信息
*/
@PreAuthorize("@ss.hasPermi('system:info:query')")
@GetMapping(value = "/{vehicleId}")
public AjaxResult getInfo(@PathVariable("vehicleId") Long vehicleId)
{
return AjaxResult.success(tVehicleInfoService.selectTVehicleInfoById(vehicleId));
}
/**
* 新增燃气车辆信息
*/
@PreAuthorize("@ss.hasPermi('system:info:add')")
@Log(title = "燃气车辆信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TVehicleInfo tVehicleInfo)
{
return toAjax(tVehicleInfoService.insertTVehicleInfo(tVehicleInfo));
}
/**
* 修改燃气车辆信息
*/
@PreAuthorize("@ss.hasPermi('system:info:edit')")
@Log(title = "燃气车辆信息", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TVehicleInfo tVehicleInfo)
{
return toAjax(tVehicleInfoService.updateTVehicleInfo(tVehicleInfo));
}
/**
* 删除燃气车辆信息
*/
@PreAuthorize("@ss.hasPermi('system:info:remove')")
@Log(title = "燃气车辆信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{vehicleIds}")
public AjaxResult remove(@PathVariable Long[] vehicleIds)
{
return toAjax(tVehicleInfoService.deleteTVehicleInfoByIds(vehicleIds));
}
}
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/system/TVehicleUseRecordController.java 0 → 100644
View file @ c75faf33
package com.zehong.web.controller.system;
import java.util.List;
import com.zehong.common.core.domain.model.LoginUser;
import com.zehong.common.utils.ServletUtils;
import com.zehong.framework.web.service.TokenService;
import org.springframework.security.access.prepost.PreAuthorize;
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.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.enums.BusinessType;
import com.zehong.system.domain.TVehicleUseRecord;
import com.zehong.system.service.ITVehicleUseRecordService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
/**
* 车辆使用记录Controller
*
* @author zehong
* @date 2023-08-19
*/
@RestController
@RequestMapping("/system/record")
public class TVehicleUseRecordController extends BaseController
{
@Autowired
private ITVehicleUseRecordService tVehicleUseRecordService;
@Autowired
private TokenService tokenService;
/**
* 查询车辆使用记录列表
*/
@PreAuthorize("@ss.hasPermi('system:record:list')")
@GetMapping("/list")
public TableDataInfo list(TVehicleUseRecord tVehicleUseRecord)
{
startPage();
List<TVehicleUseRecord> list = tVehicleUseRecordService.selectTVehicleUseRecordList(tVehicleUseRecord);
return getDataTable(list);
}
/**
* 导出车辆使用记录列表
*/
@PreAuthorize("@ss.hasPermi('system:record:export')")
@Log(title = "车辆使用记录", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TVehicleUseRecord tVehicleUseRecord)
{
List<TVehicleUseRecord> list = tVehicleUseRecordService.selectTVehicleUseRecordList(tVehicleUseRecord);
ExcelUtil<TVehicleUseRecord> util = new ExcelUtil<TVehicleUseRecord>(TVehicleUseRecord.class);
return util.exportExcel(list, "车辆使用记录数据");
}
/**
* 获取车辆使用记录详细信息
*/
@PreAuthorize("@ss.hasPermi('system:record:query')")
@GetMapping(value = "/{vehicleUseRecordId}")
public AjaxResult getInfo(@PathVariable("vehicleUseRecordId") Long vehicleUseRecordId)
{
return AjaxResult.success(tVehicleUseRecordService.selectTVehicleUseRecordById(vehicleUseRecordId));
}
/**
* 新增车辆使用记录
*/
@PreAuthorize("@ss.hasPermi('system:record:add')")
@Log(title = "车辆使用记录", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TVehicleUseRecord tVehicleUseRecord)
{
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
Long userId = loginUser.getUser().getUserId();
tVehicleUseRecord.setVehicleUserId(userId);
return toAjax(tVehicleUseRecordService.insertTVehicleUseRecord(tVehicleUseRecord));
}
/**
* 修改车辆使用记录
*/
@PreAuthorize("@ss.hasPermi('system:record:edit')")
@Log(title = "车辆使用记录", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TVehicleUseRecord tVehicleUseRecord)
{
return toAjax(tVehicleUseRecordService.updateTVehicleUseRecord(tVehicleUseRecord));
}
/**
* 删除车辆使用记录
*/
@PreAuthorize("@ss.hasPermi('system:record:remove')")
@Log(title = "车辆使用记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{vehicleUseRecordIds}")
public AjaxResult remove(@PathVariable Long[] vehicleUseRecordIds)
{
return toAjax(tVehicleUseRecordService.deleteTVehicleUseRecordByIds(vehicleUseRecordIds));
}
}
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/tool/TimeConfig.java 0 → 100644
View file @ c75faf33
package com.zehong.web.controller.tool;
import com.zehong.common.utils.DateUtils;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* 时间工具类
*/
public class TimeConfig {
//获取近七天日期
public static List<String> getSevenDate() {
List<String> dateList = new ArrayList<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
for (int i = 0; i < 7; i++) {
Date date = DateUtils.addDays(new Date(), -i);
String formatDate = sdf.format(date);
dateList.add(formatDate);
}
return dateList;
}
}
gassafetyprogress-admin/src/main/resources/application-dev.yml
View file @ c75faf33
......@@ -6,16 +6,17 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: root
url: jdbc:mysql://36.138.180.129:3306/gas_progress_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#url: jdbc:mysql://36.148.23.59:3306/gas_progress_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: gas_progress_db
password: RMtiC6YCzdLxeJJL
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
......@@ -35,7 +36,7 @@ spring:
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
webStatFilter:
enabled: true
statViewServlet:
enabled: true
......@@ -58,7 +59,7 @@ spring:
# redis 配置
redis:
# 地址
host: localhost
host: 127.0.0.1
# 端口，默认为6379
port: 6379
# 数据库索引
......@@ -90,7 +91,7 @@ zehong:
# 实例演示开关
demoEnabled: true
# 文件路径 示例（ Windows配置D:/zehong/uploadPath，Linux配置 /home/zehong/uploadPath）
profile: /home/zehong/uploadPath
profile: D:/zehong/uploadPath
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
......
gassafetyprogress-admin/src/main/resources/application-test.yml
View file @ c75faf33
......@@ -6,10 +6,10 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://36.138.180.129:3306/gas_progress_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://36.138.180.82:3309/gas_progress_db_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#url: jdbc:mysql://36.148.23.59:3306/gas_progress_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: gas_progress_db
password: RMtiC6YCzdLxeJJL
username: zhkj_db_n
password: Fwn4B8nALmLtNh2y
# 从库数据源
slave:
# 从数据源开关/默认关闭
......@@ -59,13 +59,13 @@ spring:
# redis 配置
redis:
# 地址
host: 127.0.0.1
host: 36.138.180.82
# 端口，默认为6379
port: 6379
port: 63798
# 数据库索引
database: 0
database: 6
# 密码
password:
password: 1qaz2wsx3edc
# 连接超时时间
timeout: 10s
lettuce:
......
gassafetyprogress-admin/src/main/resources/application.yml
View file @ c75faf33
......@@ -26,7 +26,7 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
active: test
active: dev
# 文件上传
servlet:
multipart:
......
gassafetyprogress-system/src/main/java/com/zehong/system/domain/AirChargeOperatorStatistics.java 0 → 100644
View file @ c75faf33
package com.zehong.system.domain;
import com.zehong.common.annotation.Excel;
/**
* @author geng
* 充装人员统计
*/
public class AirChargeOperatorStatistics extends AirChargeStationStatistics {
/**充装人*/
@Excel(name = "充装人")
private String operator;
public String getOperator() {
return operator;
}
public void setOperator(String operator) {
this.operator = operator;
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/AirChargeStationStatistics.java 0 → 100644
View file @ c75faf33
package com.zehong.system.domain;
import com.zehong.common.annotation.Excel;
/**
* @author geng
* 充装储配站统计
*/
public class AirChargeStationStatistics {
private Long StationId;
/**储配站*/
@Excel(name = "储配站")
private String stationName;
/**充装气瓶数*/
@Excel(name = "充装气瓶数")
private Integer bottleNum;
/**充装总量*/
@Excel(name = "充装总量")
private Integer chargeMeasure;
/**充装统计类型*/
private String statisticsType;
public Long getStationId() {
return StationId;
}
public void setStationId(Long stationId) {
StationId = stationId;
}
public String getStationName() {
return stationName;
}
public void setStationName(String stationName) {
this.stationName = stationName;
}
public Integer getBottleNum() {
return bottleNum;
}
public void setBottleNum(Integer bottleNum) {
this.bottleNum = bottleNum;
}
public Integer getChargeMeasure() {
return chargeMeasure;
}
public void setChargeMeasure(Integer chargeMeasure) {
this.chargeMeasure = chargeMeasure;
}
public String getStatisticsType() {
return statisticsType;
}
public void setStatisticsType(String statisticsType) {
this.statisticsType = statisticsType;
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/BaseInfoStatistics.java 0 → 100644
View file @ c75faf33
package com.zehong.system.domain;
import com.zehong.common.annotation.Excel;
public class BaseInfoStatistics {
/**储配站*/
@Excel(name = "储配站")
private String stationName;
/**气瓶数量*/
@Excel(name = "气瓶数量")
private int totalBottle;
/**车辆数量*/
@Excel(name = "车辆数量")
private int totalVehicle;
/**从业人员数量*/
@Excel(name = "从业人员数量")
private int totalPractitioner;
public String getStationName() {
return stationName;
}
public void setStationName(String stationName) {
this.stationName = stationName;
}
public int getTotalBottle() {
return totalBottle;
}
public void setTotalBottle(int totalBottle) {
this.totalBottle = totalBottle;
}
public int getTotalVehicle() {
return totalVehicle;
}
public void setTotalVehicle(int totalVehicle) {
this.totalVehicle = totalVehicle;
}
public int getTotalPractitioner() {
return totalPractitioner;
}
public void setTotalPractitioner(int totalPractitioner) {
this.totalPractitioner = totalPractitioner;
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/BottleStatistics.java 0 → 100644
View file @ c75faf33
package com.zehong.system.domain;
import com.zehong.common.annotation.Excel;
public class BottleStatistics {
/** 储配站主键*/
private Long stationId;
/** 储配站*/
@Excel(name = "储配站")
private String stationName;
/** 气瓶数量*/
@Excel(name = "气瓶数量")
private Integer totalNum;
/** 正常数量*/
@Excel(name = "正常数量")
private Integer normalNum;
/** 逾期数量*/
@Excel(name = "逾期数量")
private Integer overNum;
/** 报废数量*/
@Excel(name = "报废数量")
private Integer junkNum;
public Long getStationId() {
return stationId;
}
public void setStationId(Long stationId) {
this.stationId = stationId;
}
public String getStationName() {
return stationName;
}
public void setStationName(String stationName) {
this.stationName = stationName;
}
public Integer getTotalNum() {
return totalNum;
}
public void setTotalNum(Integer totalNum) {
this.totalNum = totalNum;
}
public Integer getNormalNum() {
return normalNum;
}
public void setNormalNum(Integer normalNum) {
this.normalNum = normalNum;
}
public Integer getOverNum() {
return overNum;
}
public void setOverNum(Integer overNum) {
this.overNum = overNum;
}
public Integer getJunkNum() {
return junkNum;
}
public void setJunkNum(Integer junkNum) {
this.junkNum = junkNum;
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/Statistics.java 0 → 100644
View file @ c75faf33
package com.zehong.system.domain;
import lombok.Data;
import lombok.ToString;
/**
* 统计封装类
*/
@Data
@ToString
public class Statistics {
private int count;
private String date;
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TAirChargeRecord.java 0 → 100644
View file @ c75faf33
package com.zehong.system.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
/**
* 充装记录对象 t_air_charge_record
*
* @author zehong
* @date 2023-08-21
*/
public class TAirChargeRecord extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 充装主键 */
private Long chargeRecordId;
/** 储配站主键 */
private Long stationId;
@Excel(name = "储配站")
private String stationName;
@Excel(name = "气瓶条码")
private String bottleCode;
private String bottleCapacity;
private String bottleStatus;
@Excel(name = "充装人员")
private String chargeOperatorName;
/** 气瓶主键 */
private Long bottleId;
/** 充装人员 */
private Long chargeOperator;
/** 充装量 */
@Excel(name = "充装量")
private String chargeMeasure;
/** 充装时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "充装时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date chargeDate;
/** 删除状态：0.否 1.是 */
private String isDel;
private Date chargeBeginTime;
private Date chargeEndTime;
public void setChargeRecordId(Long chargeRecordId)
{
this.chargeRecordId = chargeRecordId;
}
public Long getChargeRecordId()
{
return chargeRecordId;
}
public void setStationId(Long stationId)
{
this.stationId = stationId;
}
public Long getStationId()
{
return stationId;
}
public void setBottleId(Long bottleId)
{
this.bottleId = bottleId;
}
public String getStationName() {
return stationName;
}
public void setStationName(String stationName) {
this.stationName = stationName;
}
public String getBottleCode() {
return bottleCode;
}
public void setBottleCode(String bottleCode) {
this.bottleCode = bottleCode;
}
public String getBottleCapacity() {
return bottleCapacity;
}
public void setBottleCapacity(String bottleCapacity) {
this.bottleCapacity = bottleCapacity;
}
public String getBottleStatus() {
return bottleStatus;
}
public void setBottleStatus(String bottleStatus) {
this.bottleStatus = bottleStatus;
}
public String getChargeOperatorName() {
return chargeOperatorName;
}
public void setChargeOperatorName(String chargeOperatorName) {
this.chargeOperatorName = chargeOperatorName;
}
public Long getBottleId()
{
return bottleId;
}
public void setChargeOperator(Long chargeOperator)
{
this.chargeOperator = chargeOperator;
}
public Long getChargeOperator()
{
return chargeOperator;
}
public void setChargeMeasure(String chargeMeasure)
{
this.chargeMeasure = chargeMeasure;
}
public String getChargeMeasure()
{
return chargeMeasure;
}
public void setChargeDate(Date chargeDate)
{
this.chargeDate = chargeDate;
}
public Date getChargeDate()
{
return chargeDate;
}
public void setIsDel(String isDel)
{
this.isDel = isDel;
}
public String getIsDel()
{
return isDel;
}
public Date getChargeBeginTime() {
return chargeBeginTime;
}
public void setChargeBeginTime(Date chargeBeginTime) {
this.chargeBeginTime = chargeBeginTime;
}
public Date getChargeEndTime() {
return chargeEndTime;
}
public void setChargeEndTime(Date chargeEndTime) {
this.chargeEndTime = chargeEndTime;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("chargeRecordId", getChargeRecordId())
.append("stationId", getStationId())
.append("bottleId", getBottleId())
.append("chargeOperator", getChargeOperator())
.append("chargeMeasure", getChargeMeasure())
.append("chargeDate", getChargeDate())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.append("isDel", getIsDel())
.append("remark", getRemark())
.toString();
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TDeliveryRecord.java 0 → 100644
View file @ c75faf33
package com.zehong.system.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
/**
* 配送记录对象 t_delivery_record
*
* @author zehong
* @date 2023-08-22
*/
public class TDeliveryRecord extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 配送记录主键 */
private Long deliveryRecordId;
/** 储配站主键 */
@Excel(name = "储配站主键")
private Long stationId;
/** 气瓶主键 */
@Excel(name = "气瓶主键")
private Long bottleId;
/** 配送人员 */
@Excel(name = "配送人员")
private String deliveryPerson;
/** 车辆代码 */
@Excel(name = "车辆代码")
private String vehicleCode;
/** 用户主键 */
@Excel(name = "用户主键")
private Long gasUserId;
/** 配送地址 */
@Excel(name = "配送地址")
private String deliveryAddress;
/** 配送时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "配送时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date deliveryDate;
/** 删除状态：0.否 1.是 */
@Excel(name = "删除状态：0.否 1.是")
private String isDel;
/**
* 储配站名称
*/
private String stationName;
/**
* 气瓶条码
*/
private String bottleCode;
/**
* 气瓶规格
*/
private String bottleSpecs;
/**
* 气瓶状态 1正常 2逾期未检 3报废
*/
private Integer bottleStatus;
/**
* 用户名称
*/
private String gasUserName;
/**
* 用户类型 0居民 1非居民
*/
private String gasUserType;
public static long getSerialVersionUID() {
return serialVersionUID;
}
public String getStationName() {
return stationName;
}
public void setStationName(String stationName) {
this.stationName = stationName;
}
public String getBottleCode() {
return bottleCode;
}
public void setBottleCode(String bottleCode) {
this.bottleCode = bottleCode;
}
public String getBottleSpecs() {
return bottleSpecs;
}
public void setBottleSpecs(String bottleSpecs) {
this.bottleSpecs = bottleSpecs;
}
public Integer getBottleStatus() {
return bottleStatus;
}
public void setBottleStatus(Integer bottleStatus) {
this.bottleStatus = bottleStatus;
}
public String getGasUserName() {
return gasUserName;
}
public void setGasUserName(String gasUserName) {
this.gasUserName = gasUserName;
}
public String getGasUserType() {
return gasUserType;
}
public void setGasUserType(String gasUserType) {
this.gasUserType = gasUserType;
}
public void setDeliveryRecordId(Long deliveryRecordId)
{
this.deliveryRecordId = deliveryRecordId;
}
public Long getDeliveryRecordId()
{
return deliveryRecordId;
}
public void setStationId(Long stationId)
{
this.stationId = stationId;
}
public Long getStationId()
{
return stationId;
}
public void setBottleId(Long bottleId)
{
this.bottleId = bottleId;
}
public Long getBottleId()
{
return bottleId;
}
public String getDeliveryPerson() {
return deliveryPerson;
}
public void setDeliveryPerson(String deliveryPerson) {
this.deliveryPerson = deliveryPerson;
}
public void setVehicleCode(String vehicleCode)
{
this.vehicleCode = vehicleCode;
}
public String getVehicleCode()
{
return vehicleCode;
}
public void setGasUserId(Long gasUserId)
{
this.gasUserId = gasUserId;
}
public Long getGasUserId()
{
return gasUserId;
}
public void setDeliveryAddress(String deliveryAddress)
{
this.deliveryAddress = deliveryAddress;
}
public String getDeliveryAddress()
{
return deliveryAddress;
}
public void setDeliveryDate(Date deliveryDate)
{
this.deliveryDate = deliveryDate;
}
public Date getDeliveryDate()
{
return deliveryDate;
}
public void setIsDel(String isDel)
{
this.isDel = isDel;
}
public String getIsDel()
{
return isDel;
}
@Override
public String toString() {
return "TDeliveryRecord{" +
"deliveryRecordId=" + deliveryRecordId +
", stationId=" + stationId +
", bottleId=" + bottleId +
", deliveryPerson=" + deliveryPerson +
", vehicleCode='" + vehicleCode + '\'' +
", gasUserId=" + gasUserId +
", deliveryAddress='" + deliveryAddress + '\'' +
", deliveryDate=" + deliveryDate +
", isDel='" + isDel + '\'' +
", stationName='" + stationName + '\'' +
", bottleCode='" + bottleCode + '\'' +
", bottleSpecs='" + bottleSpecs + '\'' +
", bottleStatus=" + bottleStatus +
", gasUserName='" + gasUserName + '\'' +
", gasUserType='" + gasUserType + '\'' +
'}';
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TDetectorUserCount.java 0 → 100644
View file @ c75faf33
package com.zehong.system.domain;
import lombok.Data;
import lombok.ToString;
/**
* 用户信息统计封装类
*/
@Data
@ToString
public class TDetectorUserCount {
/**
* 用户总数
*/
private int totalNumberUsers;
/**
* 居民用户
*/
private int residentUsers;
/**
* 商业用户
*/
private int businessUser;
/**
* 工业用户
*/
private int industrialUsers;
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TGasBottleTrackRecord.java 0 → 100644
View file @ c75faf33
package com.zehong.system.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
/**
* 气瓶追溯对象 t_gas_bottle_track_record
*
* @author zehong
* @date 2023-08-18
*/
public class TGasBottleTrackRecord extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 追溯主键 */
private Long trackRecordId;
/** 储配站主键 */
private Long stationId;
/**储配站*/
@Excel(name="储配站")
private String stationName;
/** 气瓶主键 */
private Long bottleId;
/**气瓶编号*/
@Excel(name = "气瓶条码")
private String bottleCode;
/**规格*/
@Excel(name = "气瓶规格/L")
private String bottleCapacity;
/** 工序名称：0.气瓶充装 1.气瓶配送 2.气瓶回收 */
@Excel(name = "工序名称：0.气瓶充装 1.气瓶配送 2.气瓶回收")
private String processesName;
/** 工序关联主键用于查看 */
private Long processesRelationId;
/** 操作时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date operateDate;
/** 操作人 */
private Long operator;
@Excel(name = "操作人")
private String operatorName;
/** 发送方 */
@Excel(name = "发送方")
private String sender;
/** 接收方 */
@Excel(name = "接收方")
private String recipient;
/** 删除状态：0.否 1.是 */
private String isDel;
private String messageInfo;
public void setTrackRecordId(Long trackRecordId)
{
this.trackRecordId = trackRecordId;
}
public Long getTrackRecordId()
{
return trackRecordId;
}
public void setStationId(Long stationId)
{
this.stationId = stationId;
}
public Long getStationId()
{
return stationId;
}
public void setBottleId(Long bottleId)
{
this.bottleId = bottleId;
}
public Long getBottleId()
{
return bottleId;
}
public String getBottleCode() {
return bottleCode;
}
public void setBottleCode(String bottleCode) {
this.bottleCode = bottleCode;
}
public String getBottleCapacity() {
return bottleCapacity;
}
public void setBottleCapacity(String bottleCapacity) {
this.bottleCapacity = bottleCapacity;
}
public void setProcessesName(String processesName)
{
this.processesName = processesName;
}
public String getProcessesName()
{
return processesName;
}
public void setProcessesRelationId(Long processesRelationId)
{
this.processesRelationId = processesRelationId;
}
public Long getProcessesRelationId()
{
return processesRelationId;
}
public void setOperateDate(Date operateDate)
{
this.operateDate = operateDate;
}
public Date getOperateDate()
{
return operateDate;
}
public void setOperator(Long operator)
{
this.operator = operator;
}
public Long getOperator()
{
return operator;
}
public String getOperatorName() {
return operatorName;
}
public void setOperatorName(String operatorName) {
this.operatorName = operatorName;
}
public void setSender(String sender)
{
this.sender = sender;
}
public String getSender()
{
return sender;
}
public void setRecipient(String recipient)
{
this.recipient = recipient;
}
public String getRecipient()
{
return recipient;
}
public void setIsDel(String isDel)
{
this.isDel = isDel;
}
public String getIsDel()
{
return isDel;
}
public String getStationName() {
return stationName;
}
public void setStationName(String stationName) {
this.stationName = stationName;
}
public String getMessageInfo() {
return messageInfo;
}
public void setMessageInfo(String messageInfo) {
this.messageInfo = messageInfo;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("trackRecordId", getTrackRecordId())
.append("stationId", getStationId())
.append("bottleId", getBottleId())
.append("processesName", getProcessesName())
.append("processesRelationId", getProcessesRelationId())
.append("operateDate", getOperateDate())
.append("operator", getOperator())
.append("sender", getSender())
.append("recipient", getRecipient())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.append("isDel", getIsDel())
.append("remark", getRemark())
.toString();
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TGasStorageStationInfo.java 0 → 100644
View file @ c75faf33
package com.zehong.system.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
/**
* 储配站信息对象 t_gas_storage_station_info
*
* @author zehong
* @date 2023-08-14
*/
public class TGasStorageStationInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 储配站主键 */
private Long stationId;
/** 名称 */
@Excel(name = "储配站名称")
private String stationName;
/** 代码 */
@Excel(name = "储配站编号")
private String stationCode;
/** 负责人 */
@Excel(name = "负责人")
private String director;
/** 联系电话 */
@Excel(name = "联系电话")
private String telNum;
/** 地址 */
@Excel(name = "地址")
private String address;
/** 许可证文件 */
@Excel(name = "许可证文件")
private String licenceFile;
/** 许可证编号 */
@Excel(name = "许可证编号")
private String licenceCode;
/** 许可证有效时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "许可证日期起", width = 30, dateFormat = "yyyy-MM-dd")
private Date licenceEffectiveDate;
/** 许可证有效期截止日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "许可证日期止", width = 30, dateFormat = "yyyy-MM-dd")
private Date licenceLimitDate;
/** 经度 */
@Excel(name = "经度")
private BigDecimal longitude;
/** 纬度 */
@Excel(name = "纬度")
private BigDecimal latitude;
private Date createBeginTime;
private Date createEndTime;
public void setStationId(Long stationId)
{
this.stationId = stationId;
}
public Long getStationId()
{
return stationId;
}
public void setStationName(String stationName)
{
this.stationName = stationName;
}
public String getStationName()
{
return stationName;
}
public void setStationCode(String stationCode)
{
this.stationCode = stationCode;
}
public String getStationCode()
{
return stationCode;
}
public void setDirector(String director)
{
this.director = director;
}
public String getDirector()
{
return director;
}
public void setTelNum(String telNum)
{
this.telNum = telNum;
}
public String getTelNum()
{
return telNum;
}
public void setAddress(String address)
{
this.address = address;
}
public String getAddress()
{
return address;
}
public void setLicenceFile(String licenceFile)
{
this.licenceFile = licenceFile;
}
public String getLicenceFile()
{
return licenceFile;
}
public void setLicenceCode(String licenceCode)
{
this.licenceCode = licenceCode;
}
public String getLicenceCode()
{
return licenceCode;
}
public void setLicenceEffectiveDate(Date licenceEffectiveDate)
{
this.licenceEffectiveDate = licenceEffectiveDate;
}
public Date getLicenceEffectiveDate()
{
return licenceEffectiveDate;
}
public void setLicenceLimitDate(Date licenceLimitDate)
{
this.licenceLimitDate = licenceLimitDate;
}
public Date getLicenceLimitDate()
{
return licenceLimitDate;
}
public void setLongitude(BigDecimal longitude)
{
this.longitude = longitude;
}
public BigDecimal getLongitude()
{
return longitude;
}
public void setLatitude(BigDecimal latitude)
{
this.latitude = latitude;
}
public BigDecimal getLatitude()
{
return latitude;
}
public Date getCreateBeginTime() {
return createBeginTime;
}
public void setCreateBeginTime(Date createBeginTime) {
this.createBeginTime = createBeginTime;
}
public Date getCreateEndTime() {
return createEndTime;
}
public void setCreateEndTime(Date createEndTime) {
this.createEndTime = createEndTime;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("stationId", getStationId())
.append("stationName", getStationName())
.append("stationCode", getStationCode())
.append("director", getDirector())
.append("telNum", getTelNum())
.append("address", getAddress())
.append("licenceFile", getLicenceFile())
.append("licenceCode", getLicenceCode())
.append("licenceEffectiveDate", getLicenceEffectiveDate())
.append("licenceLimitDate", getLicenceLimitDate())
.append("longitude", getLongitude())
.append("latitude", getLatitude())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TGasUserInfo.java 0 → 100644
View file @ c75faf33
package com.zehong.system.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
/**
* 燃气用户对象 t_gas_user_info
*
* @author zehong
* @date 2023-08-17
*/
public class TGasUserInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 燃气用户主键 */
private Long gasUserId;
/** 名称 */
@Excel(name = "用户名称")
private String gasUserName;
/** 代码 */
@Excel(name = "用户编码")
private String gasUserCode;
/** 0.居民 1.非居民 */
@Excel(name = "用户类型：0.居民 1.非居民")
private String gasUserType;
/** 联系电话 */
@Excel(name = "联系电话")
private String telNum;
/** 0.正常 1.停用 */
@Excel(name = "用户状态：0.正常 1.停用")
private String gasUserStatus;
/** 用户地址 */
@Excel(name = "用户地址")
private String gasUserAddress;
/** 末次配送时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "末次配送时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date lastDeliveryDate;
/** 入户安检状态：0.正常入户 1.拒绝安检 */
@Excel(name = "入户安检状态：0.正常入户 1.拒绝安检")
private String gasUserCheckStatus;
/** 累计安检次数 */
@Excel(name = "累计安检次数")
private Integer totalCheckNum;
/** 删除状态：0.否 1.是 */
private String isDel;
public void setGasUserId(Long gasUserId)
{
this.gasUserId = gasUserId;
}
public Long getGasUserId()
{
return gasUserId;
}
public void setGasUserName(String gasUserName)
{
this.gasUserName = gasUserName;
}
public String getGasUserName()
{
return gasUserName;
}
public void setGasUserCode(String gasUserCode)
{
this.gasUserCode = gasUserCode;
}
public String getGasUserCode()
{
return gasUserCode;
}
public void setGasUserType(String gasUserType)
{
this.gasUserType = gasUserType;
}
public String getGasUserType()
{
return gasUserType;
}
public void setTelNum(String telNum)
{
this.telNum = telNum;
}
public String getTelNum()
{
return telNum;
}
public void setGasUserStatus(String gasUserStatus)
{
this.gasUserStatus = gasUserStatus;
}
public String getGasUserStatus()
{
return gasUserStatus;
}
public void setGasUserAddress(String gasUserAddress)
{
this.gasUserAddress = gasUserAddress;
}
public String getGasUserAddress()
{
return gasUserAddress;
}
public void setLastDeliveryDate(Date lastDeliveryDate)
{
this.lastDeliveryDate = lastDeliveryDate;
}
public Date getLastDeliveryDate()
{
return lastDeliveryDate;
}
public void setGasUserCheckStatus(String gasUserCheckStatus)
{
this.gasUserCheckStatus = gasUserCheckStatus;
}
public String getGasUserCheckStatus()
{
return gasUserCheckStatus;
}
public void setTotalCheckNum(Integer totalCheckNum)
{
this.totalCheckNum = totalCheckNum;
}
public Integer getTotalCheckNum()
{
return totalCheckNum;
}
public void setIsDel(String isDel)
{
this.isDel = isDel;
}
public String getIsDel()
{
return isDel;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("gasUserId", getGasUserId())
.append("gasUserName", getGasUserName())
.append("gasUserCode", getGasUserCode())
.append("gasUserType", getGasUserType())
.append("telNum", getTelNum())
.append("gasUserStatus", getGasUserStatus())
.append("gasUserAddress", getGasUserAddress())
.append("lastDeliveryDate", getLastDeliveryDate())
.append("gasUserCheckStatus", getGasUserCheckStatus())
.append("totalCheckNum", getTotalCheckNum())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.append("isDel", getIsDel())
.append("remark", getRemark())
.toString();
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TPractitionerInfo.java 0 → 100644
View file @ c75faf33
package com.zehong.system.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
/**
* 从业人员信息对象 t_practitioner_info
*
* @author zehong
* @date 2023-08-16
*/
public class TPractitionerInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 从业人员主键 */
private Long practitionerId;
/** 储配站 */
private Long stationId;
@Excel(name = "储配站")
private String stationName;
/** 工号 */
@Excel(name = "工号")
private String practitionerNum;
/** 姓名 */
@Excel(name = "姓名")
private String name;
/** 性别 */
@Excel(name = "性别: 0.男 1女")
private String sex;
/** 出生日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date birthDate;
/** 岗位 */
private Long postId;
@Excel(name = "岗位")
private String postName;
/** 联系电话 */
@Excel(name = "联系电话")
private String telNum;
/** 配送区域 */
@Excel(name = "配送区域")
private String deliveryArea;
/** 人员照片 */
@Excel(name = "人员照片")
private String personPhoto;
/** 证书文件 */
@Excel(name = "证书文件")
private String licenseFile;
/** 从业资格编号 */
@Excel(name = "从业资格编号")
private String certificateNum;
/** 从业资格证有效时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "从业资格证有效时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date certificateEffectiveDate;
/** 密码 */
@Excel(name = "密码")
private String password;
/** 删除状态：0.否 1.是 */
private String isDel;
public void setPractitionerId(Long practitionerId)
{
this.practitionerId = practitionerId;
}
public Long getPractitionerId()
{
return practitionerId;
}
public void setStationId(Long stationId)
{
this.stationId = stationId;
}
public Long getStationId()
{
return stationId;
}
public void setPractitionerNum(String practitionerNum)
{
this.practitionerNum = practitionerNum;
}
public String getPractitionerNum()
{
return practitionerNum;
}
public void setName(String name)
{
this.name = name;
}
public String getName()
{
return name;
}
public void setSex(String sex)
{
this.sex = sex;
}
public String getSex()
{
return sex;
}
public void setBirthDate(Date birthDate)
{
this.birthDate = birthDate;
}
public Date getBirthDate()
{
return birthDate;
}
public void setPostId(Long postId)
{
this.postId = postId;
}
public Long getPostId()
{
return postId;
}
public void setTelNum(String telNum)
{
this.telNum = telNum;
}
public String getTelNum()
{
return telNum;
}
public void setDeliveryArea(String deliveryArea)
{
this.deliveryArea = deliveryArea;
}
public String getDeliveryArea()
{
return deliveryArea;
}
public void setPersonPhoto(String personPhoto)
{
this.personPhoto = personPhoto;
}
public String getPersonPhoto()
{
return personPhoto;
}
public void setLicenseFile(String licenseFile)
{
this.licenseFile = licenseFile;
}
public String getLicenseFile()
{
return licenseFile;
}
public void setCertificateNum(String certificateNum)
{
this.certificateNum = certificateNum;
}
public String getCertificateNum()
{
return certificateNum;
}
public void setCertificateEffectiveDate(Date certificateEffectiveDate)
{
this.certificateEffectiveDate = certificateEffectiveDate;
}
public Date getCertificateEffectiveDate()
{
return certificateEffectiveDate;
}
public void setPassword(String password)
{
this.password = password;
}
public String getPassword()
{
return password;
}
public void setIsDel(String isDel)
{
this.isDel = isDel;
}
public String getIsDel()
{
return isDel;
}
public String getStationName() {
return stationName;
}
public void setStationName(String stationName) {
this.stationName = stationName;
}
public String getPostName() {
return postName;
}
public void setPostName(String postName) {
this.postName = postName;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("practitionerId", getPractitionerId())
.append("stationId", getStationId())
.append("practitionerNum", getPractitionerNum())
.append("name", getName())
.append("sex", getSex())
.append("birthDate", getBirthDate())
.append("postId", getPostId())
.append("telNum", getTelNum())
.append("deliveryArea", getDeliveryArea())
.append("personPhoto", getPersonPhoto())
.append("licenseFile", getLicenseFile())
.append("certificateNum", getCertificateNum())
.append("certificateEffectiveDate", getCertificateEffectiveDate())
.append("password", getPassword())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.append("isDel", getIsDel())
.append("remark", getRemark())
.toString();
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TVehicleInfo.java
View file @ c75faf33
......@@ -9,9 +9,9 @@ import java.math.BigDecimal;
/**
* 燃气车辆信息对象 t_vehicle_info
*
*
* @author zehong
* @date 2022-03-17
* @date 2023-08-16
*/
public class TVehicleInfo extends BaseEntity
{
......@@ -50,7 +50,7 @@ public class TVehicleInfo extends BaseEntity
/** 所属企业 */
@Excel(name = "所属企业")
private String beyondEnterpriseId;
private int beyondEnterpriseId;
/** 责任人 */
@Excel(name = "责任人")
......@@ -69,15 +69,36 @@ public class TVehicleInfo extends BaseEntity
private String remarks;
/**
* 经度
* 储配站名称
*/
private String siteStationName;
private BigDecimal longitude;
/**
* 纬度
*/
private BigDecimal latitude;
private String beyondEnterpriseName;
public String getSiteStationName() {
return siteStationName;
}
public void setSiteStationName(String siteStationName) {
this.siteStationName = siteStationName;
}
public String getBeyondEnterpriseName() {
return beyondEnterpriseName;
}
public void setBeyondEnterpriseName(String beyondEnterpriseName) {
this.beyondEnterpriseName = beyondEnterpriseName;
}
public static long getSerialVersionUID() {
return serialVersionUID;
}
public BigDecimal getLongitude() {
return longitude;
......@@ -100,115 +121,115 @@ public class TVehicleInfo extends BaseEntity
this.vehicleId = vehicleId;
}
public Long getVehicleId()
public Long getVehicleId()
{
return vehicleId;
}
public void setCarNum(String carNum)
public void setCarNum(String carNum)
{
this.carNum = carNum;
}
public String getCarNum()
public String getCarNum()
{
return carNum;
}
public void setBrandModel(String brandModel)
public void setBrandModel(String brandModel)
{
this.brandModel = brandModel;
}
public String getBrandModel()
public String getBrandModel()
{
return brandModel;
}
public void setVehicleType(String vehicleType)
public void setVehicleType(String vehicleType)
{
this.vehicleType = vehicleType;
}
public String getVehicleType()
public String getVehicleType()
{
return vehicleType;
}
public void setVehicleLoad(String vehicleLoad)
public void setVehicleLoad(String vehicleLoad)
{
this.vehicleLoad = vehicleLoad;
}
public String getVehicleLoad()
public String getVehicleLoad()
{
return vehicleLoad;
}
public void setVehicleSize(String vehicleSize)
public void setVehicleSize(String vehicleSize)
{
this.vehicleSize = vehicleSize;
}
public String getVehicleSize()
public String getVehicleSize()
{
return vehicleSize;
}
public void setVehicleLimt(String vehicleLimt)
public void setVehicleLimt(String vehicleLimt)
{
this.vehicleLimt = vehicleLimt;
}
public String getVehicleLimt()
public String getVehicleLimt()
{
return vehicleLimt;
}
public void setVehicleInspect(String vehicleInspect)
public void setVehicleInspect(String vehicleInspect)
{
this.vehicleInspect = vehicleInspect;
}
public String getVehicleInspect()
public String getVehicleInspect()
{
return vehicleInspect;
}
public void setBeyondEnterpriseId(String beyondEnterpriseId)
{
this.beyondEnterpriseId = beyondEnterpriseId;
}
public String getBeyondEnterpriseId()
{
public int getBeyondEnterpriseId() {
return beyondEnterpriseId;
}
public void setPersonLiable(String personLiable)
public void setBeyondEnterpriseId(int beyondEnterpriseId) {
this.beyondEnterpriseId = beyondEnterpriseId;
}
public void setPersonLiable(String personLiable)
{
this.personLiable = personLiable;
}
public String getPersonLiable()
public String getPersonLiable()
{
return personLiable;
}
public void setPhone(String phone)
public void setPhone(String phone)
{
this.phone = phone;
}
public String getPhone()
public String getPhone()
{
return phone;
}
public void setIsDel(String isDel)
public void setIsDel(String isDel)
{
this.isDel = isDel;
}
public String getIsDel()
public String getIsDel()
{
return isDel;
}
public void setRemarks(String remarks)
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
public String getRemarks()
{
return remarks;
}
......
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TVehicleUseRecord.java 0 → 100644
View file @ c75faf33
package com.zehong.system.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
/**
* 车辆使用记录对象 t_vehicle_use_record
*
* @author zehong
* @date 2023-08-19
*/
public class TVehicleUseRecord extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 车辆使用主键 */
private Long vehicleUseRecordId;
/** 储配站主键 */
@Excel(name = "储配站主键")
private Long stationId;
/** 车辆主键 */
@Excel(name = "车辆主键")
private Long vehicleId;
/** 车牌号 */
@Excel(name = "车牌号")
private String carNum;
/**
* 储配站名称
*/
private String siteStationName;
/**
* 使用人姓名
*/
private String name;
/**
* 车辆编号
*/
private String vehicleCode;
/** 车辆使用人 */
@Excel(name = "车辆使用人")
private Long vehicleUserId;
/** 使用时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "使用时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date vehicleUseDate;
/** 归还时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "归还时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date vehicleReturnDate;
/** 删除状态：0.否 1.是 */
@Excel(name = "删除状态：0.否 1.是")
private String isDel;
public static long getSerialVersionUID() {
return serialVersionUID;
}
public String getCarNum() {
return carNum;
}
public void setCarNum(String carNum) {
this.carNum = carNum;
}
public String getSiteStationName() {
return siteStationName;
}
public void setSiteStationName(String siteStationName) {
this.siteStationName = siteStationName;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getVehicleCode() {
return vehicleCode;
}
public void setVehicleCode(String vehicleCode) {
this.vehicleCode = vehicleCode;
}
public void setVehicleUseRecordId(Long vehicleUseRecordId)
{
this.vehicleUseRecordId = vehicleUseRecordId;
}
public Long getVehicleUseRecordId()
{
return vehicleUseRecordId;
}
public void setStationId(Long stationId)
{
this.stationId = stationId;
}
public Long getStationId()
{
return stationId;
}
public void setVehicleId(Long vehicleId)
{
this.vehicleId = vehicleId;
}
public Long getVehicleId()
{
return vehicleId;
}
public void setVehicleUserId(Long vehicleUserId)
{
this.vehicleUserId = vehicleUserId;
}
public Long getVehicleUserId()
{
return vehicleUserId;
}
public void setVehicleUseDate(Date vehicleUseDate)
{
this.vehicleUseDate = vehicleUseDate;
}
public Date getVehicleUseDate()
{
return vehicleUseDate;
}
public void setVehicleReturnDate(Date vehicleReturnDate)
{
this.vehicleReturnDate = vehicleReturnDate;
}
public Date getVehicleReturnDate()
{
return vehicleReturnDate;
}
public void setIsDel(String isDel)
{
this.isDel = isDel;
}
public String getIsDel()
{
return isDel;
}
@Override
public String toString() {
return "TVehicleUseRecord{" +
"vehicleUseRecordId=" + vehicleUseRecordId +
", stationId=" + stationId +
", vehicleId=" + vehicleId +
", carNum='" + carNum + '\'' +
", siteStationName='" + siteStationName + '\'' +
", name='" + name + '\'' +
", vehicleCode='" + vehicleCode + '\'' +
", vehicleUserId=" + vehicleUserId +
", vehicleUseDate=" + vehicleUseDate +
", vehicleReturnDate=" + vehicleReturnDate +
", isDel='" + isDel + '\'' +
'}';
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TenterpriseInfoData.java
View file @ c75faf33
......@@ -6,6 +6,16 @@ public class TenterpriseInfoData {
private String enterpriseName;
private String enterpriseType;
public String getEnterpriseType() {
return enterpriseType;
}
public void setEnterpriseType(String enterpriseType) {
this.enterpriseType = enterpriseType;
}
public String getEnterpriseId() {
return enterpriseId;
}
......
gassafetyprogress-system/src/main/java/com/zehong/system/domain/vo/AirChargeStatisticsVo.java 0 → 100644
View file @ c75faf33
package com.zehong.system.domain.vo;
import java.util.Date;
public class AirChargeStatisticsVo {
private Long StationId;
/**充装人*/
private String operator;
private String statisticsType;
private Date operateBeginTime;
private Date operateEndTime;
public Long getStationId() {
return StationId;
}
public void setStationId(Long stationId) {
StationId = stationId;
}
public String getOperator() {
return operator;
}
public void setOperator(String operator) {
this.operator = operator;
}
public String getStatisticsType() {
return statisticsType;
}
public void setStatisticsType(String statisticsType) {
this.statisticsType = statisticsType;
}
public Date getOperateBeginTime() {
return operateBeginTime;
}
public void setOperateBeginTime(Date operateBeginTime) {
this.operateBeginTime = operateBeginTime;
}
public Date getOperateEndTime() {
return operateEndTime;
}
public void setOperateEndTime(Date operateEndTime) {
this.operateEndTime = operateEndTime;
}
}
gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TAirChargeRecordMapper.java 0 → 100644
View file @ c75faf33
package com.zehong.system.mapper;
import com.zehong.system.domain.AirChargeOperatorStatistics;
import com.zehong.system.domain.AirChargeStationStatistics;
import com.zehong.system.domain.TAirChargeRecord;
import com.zehong.system.domain.vo.AirChargeStatisticsVo;
import java.util.List;
/**
* 充装记录Mapper接口
*
* @author zehong
* @date 2023-08-21
*/
public interface TAirChargeRecordMapper
{
/**
* 查询充装记录
*
* @param chargeRecordId 充装记录ID
* @return 充装记录
*/
public TAirChargeRecord selectTAirChargeRecordById(Long chargeRecordId);
/**
* 查询充装记录列表
*
* @param tAirChargeRecord 充装记录
* @return 充装记录集合
*/
public List<TAirChargeRecord> selectTAirChargeRecordList(TAirChargeRecord tAirChargeRecord);
/**
* 新增充装记录
*
* @param tAirChargeRecord 充装记录
* @return 结果
*/
public int insertTAirChargeRecord(TAirChargeRecord tAirChargeRecord);
/**
* 修改充装记录
*
* @param tAirChargeRecord 充装记录
* @return 结果
*/
public int updateTAirChargeRecord(TAirChargeRecord tAirChargeRecord);
/**
* 删除充装记录
*
* @param chargeRecordId 充装记录ID
* @return 结果
*/
public int deleteTAirChargeRecordById(Long chargeRecordId);
/**
* 批量删除充装记录
*
* @param chargeRecordIds 需要删除的数据ID
* @return 结果
*/
public int deleteTAirChargeRecordByIds(Long[] chargeRecordIds);
/**
* 储配站充装统计
* @param airChargeStatisticsVo 统计实体
* @return
*/
List<AirChargeStationStatistics> airChargeStationStatistics(AirChargeStatisticsVo airChargeStatisticsVo);
/**
* 充装人员统计
* @param airChargeStatisticsVo 统计
* @return
*/
List<AirChargeOperatorStatistics> airChargeOperatorStatistics(AirChargeStatisticsVo airChargeStatisticsVo);
}
gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TDeliveryRecordMapper.java 0 → 100644
View file @ c75faf33
package com.zehong.system.mapper;
import java.util.List;
import com.zehong.system.domain.TDeliveryRecord;
/**
* 配送记录Mapper接口
*
* @author zehong
* @date 2023-08-22
*/
public interface TDeliveryRecordMapper
{
/**
* 查询配送记录
*
* @param deliveryRecordId 配送记录ID
* @return 配送记录
*/
public TDeliveryRecord selectTDeliveryRecordById(Long deliveryRecordId);
/**
* 查询配送记录列表
*
* @param tDeliveryRecord 配送记录
* @return 配送记录集合
*/
public List<TDeliveryRecord> selectTDeliveryRecordList(TDeliveryRecord tDeliveryRecord);
/**
* 新增配送记录
*
* @param tDeliveryRecord 配送记录
* @return 结果
*/
public int insertTDeliveryRecord(TDeliveryRecord tDeliveryRecord);
/**
* 修改配送记录
*
* @param tDeliveryRecord 配送记录
* @return 结果
*/
public int updateTDeliveryRecord(TDeliveryRecord tDeliveryRecord);
/**
* 删除配送记录
*
* @param deliveryRecordId 配送记录ID
* @return 结果
*/
public int deleteTDeliveryRecordById(Long deliveryRecordId);
/**
* 批量删除配送记录
*
* @param deliveryRecordIds 需要删除的数据ID
* @return 结果
*/
public int deleteTDeliveryRecordByIds(Long[] deliveryRecordIds);
}
gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TDetectorUserMapper.java
View file @ c75faf33
......@@ -5,19 +5,20 @@ import java.util.Map;
import com.zehong.system.domain.TDetectorInfo;
import com.zehong.system.domain.TDetectorUser;
import com.zehong.system.domain.TDetectorUserCount;
import com.zehong.system.domain.vo.TDetectorUserVO;
/**
* 燃气用户Mapper接口
*
*
* @author zehong
* @date 2022-02-07
*/
public interface TDetectorUserMapper
public interface TDetectorUserMapper
{
/**
* 查询燃气用户
*
*
* @param userId 燃气用户ID
* @return 燃气用户
*/
......@@ -47,7 +48,7 @@ public interface TDetectorUserMapper
/**
* 查询燃气用户列表
*
*
* @param tDetectorUser 燃气用户
* @return 燃气用户集合
*/
......@@ -55,7 +56,7 @@ public interface TDetectorUserMapper
/**
* 新增燃气用户
*
*
* @param tDetectorUser 燃气用户
* @return 结果
*/
......@@ -63,7 +64,7 @@ public interface TDetectorUserMapper
/**
* 修改燃气用户
*
*
* @param tDetectorUser 燃气用户
* @return 结果
*/
......@@ -71,7 +72,7 @@ public interface TDetectorUserMapper
/**
* 删除燃气用户
*
*
* @param userId 燃气用户ID
* @return 结果
*/
......@@ -79,7 +80,7 @@ public interface TDetectorUserMapper
/**
* 批量删除燃气用户
*
*
* @param userIds 需要删除的数据ID
* @return 结果
*/
......@@ -90,4 +91,10 @@ public interface TDetectorUserMapper
* @return
*/
public Map<String,Object> selectUserNum();
/**
* 查询用户统计信息
* @return
*/
TDetectorUserCount userStatistics();
}
gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TGasBottleInfoMapper.java 0 → 100644
View file @ c75faf33
package com.zehong.system.mapper;
import com.zehong.system.domain.BottleStatistics;
import com.zehong.system.domain.TGasBottleInfo;
import java.util.List;
/**
* 气瓶信息Mapper接口
*
* @author zehong
* @date 2023-08-15
*/
public interface TGasBottleInfoMapper
{
/**
* 查询气瓶信息
*
* @param bottleId 气瓶信息ID
* @return 气瓶信息
*/
public TGasBottleInfo selectTGasBottleInfoById(Long bottleId);
/**
* 查询气瓶信息列表
*
* @param tGasBottleInfo 气瓶信息
* @return 气瓶信息集合
*/
public List<TGasBottleInfo> selectTGasBottleInfoList(TGasBottleInfo tGasBottleInfo);
/**
* 新增气瓶信息
*
* @param tGasBottleInfo 气瓶信息
* @return 结果
*/
public int insertTGasBottleInfo(TGasBottleInfo tGasBottleInfo);
/**
* 修改气瓶信息
*
* @param tGasBottleInfo 气瓶信息
* @return 结果
*/
public int updateTGasBottleInfo(TGasBottleInfo tGasBottleInfo);
/**
* 删除气瓶信息
*
* @param bottleId 气瓶信息ID
* @return 结果
*/
public int deleteTGasBottleInfoById(Long bottleId);
/**
* 批量删除气瓶信息
*
* @param bottleIds 需要删除的数据ID
* @return 结果
*/
public int deleteTGasBottleInfoByIds(Long[] bottleIds);
/**
* 气瓶统计
* @param stationId 储配站id
* @return
*/
List<BottleStatistics> bottleStatistics(Long stationId);
}
gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TGasBottleTrackRecordMapper.java 0 → 100644
View file @ c75faf33
package com.zehong.system.mapper;
import java.util.List;
import com.zehong.system.domain.TGasBottleTrackRecord;
/**
* 气瓶追溯Mapper接口
*
* @author zehong
* @date 2023-08-18
*/
public interface TGasBottleTrackRecordMapper
{
/**
* 查询气瓶追溯
*
* @param trackRecordId 气瓶追溯ID
* @return 气瓶追溯
*/
public TGasBottleTrackRecord selectTGasBottleTrackRecordById(Long trackRecordId);
/**
* 查询气瓶追溯列表
*
* @param tGasBottleTrackRecord 气瓶追溯
* @return 气瓶追溯集合
*/
public List<TGasBottleTrackRecord> selectTGasBottleTrackRecordList(TGasBottleTrackRecord tGasBottleTrackRecord);
/**
* 新增气瓶追溯
*
* @param tGasBottleTrackRecord 气瓶追溯
* @return 结果
*/
public int insertTGasBottleTrackRecord(TGasBottleTrackRecord tGasBottleTrackRecord);
/**
* 修改气瓶追溯
*
* @param tGasBottleTrackRecord 气瓶追溯
* @return 结果
*/
public int updateTGasBottleTrackRecord(TGasBottleTrackRecord tGasBottleTrackRecord);
/**
* 删除气瓶追溯
*
* @param trackRecordId 气瓶追溯ID
* @return 结果
*/
public int deleteTGasBottleTrackRecordById(Long trackRecordId);
/**
* 批量删除气瓶追溯
*
* @param trackRecordIds 需要删除的数据ID
* @return 结果
*/
public int deleteTGasBottleTrackRecordByIds(Long[] trackRecordIds);
}
gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TGasStorageStationInfoMapper.java 0 → 100644
View file @ c75faf33
package com.zehong.system.mapper;
import java.util.List;
import com.zehong.system.domain.BaseInfoStatistics;
import com.zehong.system.domain.TGasStorageStationInfo;
/**
* 储配站信息Mapper接口
*
* @author zehong
* @date 2023-08-14
*/
public interface TGasStorageStationInfoMapper
{
/**
* 查询储配站信息
*
* @param stationId 储配站信息ID
* @return 储配站信息
*/
public TGasStorageStationInfo selectTGasStorageStationInfoById(Long stationId);
/**
* 查询储配站信息列表
*
* @param tGasStorageStationInfo 储配站信息
* @return 储配站信息集合
*/
public List<TGasStorageStationInfo> selectTGasStorageStationInfoList(TGasStorageStationInfo tGasStorageStationInfo);
/**
* 新增储配站信息
*
* @param tGasStorageStationInfo 储配站信息
* @return 结果
*/
public int insertTGasStorageStationInfo(TGasStorageStationInfo tGasStorageStationInfo);
/**
* 修改储配站信息
*
* @param tGasStorageStationInfo 储配站信息
* @return 结果
*/
public int updateTGasStorageStationInfo(TGasStorageStationInfo tGasStorageStationInfo);
/**
* 删除储配站信息
*
* @param stationId 储配站信息ID
* @return 结果
*/
public int deleteTGasStorageStationInfoById(Long stationId);
/**
* 批量删除储配站信息
*
* @param stationIds 需要删除的数据ID
* @return 结果
*/
public int deleteTGasStorageStationInfoByIds(Long[] stationIds);
/**
* 基础信息统计
* @param stationId 储配站id
* @return
*/
List<BaseInfoStatistics> baseInfoStatistics(Long stationId);
}
gassafetyprogress-system/src/main/resources/mapper/system/TDetectorUserMapper.xml
View file @ c75faf33
......@@ -176,4 +176,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT SUM(IF(user_type=1,1,0)) AS juminNum,SUM(IF(user_type=2,1,0)) AS shangNum,
SUM(IF(user_type=3,1,0)) AS gongNum FROM t_detector_user WHERE is_del = 0
</select>
<!--查询用户统计信息-->
<select id="userStatistics" resultType="com.zehong.system.domain.TDetectorUserCount">
SELECT
(select count(user_id) from t_detector_user where is_del='0')as totalNumberUsers,
(select count(user_id) from t_detector_user where user_type=1 and is_del='0')as residentUsers,
(select count(user_id) from t_detector_user where user_type=2 and is_del='0')as businessUser,
(select count(user_id) from t_detector_user where user_type=3 and is_del='0')as industrialUsers
FROM `t_detector_user` limit 0,1
</select>
</mapper>
gassafetyprogress-web/src/api/system/license.js 0 → 100644
View file @ c75faf33
This diff is collapsed.
gassafetyprogress-web/src/views/system/license/index.vue 0 → 100644
View file @ c75faf33
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment