Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety-progress

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TAirChargeRecordController.java

 package com.zehong.web.controller.gasBottleTrack;
 
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 import com.zehong.system.domain.AirChargeOperatorStatistics;
@@ -28,7 +32,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 充装记录Controller
- * 
+ *
  * @author zehong
  * @date 2023-08-21
  */
@@ -42,7 +46,7 @@ public class TAirChargeRecordController extends BaseController
     /**
      * 查询充装记录列表
      */
-    @PreAuthorize("@ss.hasPermi('charge:record:list')")
+//    @PreAuthorize("@ss.hasPermi('charge:record:list')")
     @GetMapping("/list")
     public TableDataInfo list(TAirChargeRecord tAirChargeRecord)
     {
@@ -74,6 +78,19 @@ public class TAirChargeRecordController extends BaseController
         return AjaxResult.success(tAirChargeRecordService.selectTAirChargeRecordById(chargeRecordId));
     }
 
+    /**
+     * 微信小程序 首页列表查询接口
+     * @param chargeRecordId
+     * @return
+     */
+    @GetMapping("/selectGetInfo")
+    public AjaxResult selectGetInfo(Long chargeRecordId){
+        TAirChargeRecord tAirChargeRecord = tAirChargeRecordService.selectTAirChargeRecordById(chargeRecordId);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("tAirChargeRecord", tAirChargeRecord);
+        return ajax;
+    }
+
     /**
      * 新增充装记录
      */
@@ -85,6 +102,20 @@ public class TAirChargeRecordController extends BaseController
         return toAjax(tAirChargeRecordService.insertTAirChargeRecord(tAirChargeRecord));
     }
 
+    /**
+     * 小程序充装记录
+     * @param tAirChargeRecord
+     * @return
+     */
+    @PostMapping("/addAirChargeRecord")
+    public AjaxResult addAirChargeRecord(@RequestBody TAirChargeRecord tAirChargeRecord) throws ParseException {
+        DateFormat fmt =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        Date date = fmt.parse(tAirChargeRecord.getChargeDates());
+        tAirChargeRecord.setChargeDate(date);
+        return toAjax(tAirChargeRecordService.insertTAirChargeRecord(tAirChargeRecord));
+    }
+
     /**
      * 修改充装记录
      */

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TGasBottleInfoController.java

@@ -18,7 +18,7 @@ import java.util.List;
 
 /**
  * 气瓶信息Controller
- * 
+ *
  * @author zehong
  * @date 2023-08-15
  */
@@ -32,7 +32,7 @@ public class TGasBottleInfoController extends BaseController
     /**
      * 查询气瓶信息列表
      */
-    @PreAuthorize("@ss.hasPermi('gasBottle:info:list')")
+//    @PreAuthorize("@ss.hasPermi('gasBottle:info:list')")
     @GetMapping("/list")
     public TableDataInfo list(TGasBottleInfo tGasBottleInfo)
     {
@@ -64,17 +64,30 @@ public class TGasBottleInfoController extends BaseController
     /**
      * 获取气瓶信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('gasBottle:info:query')")
+//    @PreAuthorize("@ss.hasPermi('gasBottle:info:query')")
     @GetMapping(value = "/{bottleId}")
     public AjaxResult getInfo(@PathVariable("bottleId") Long bottleId)
     {
         return AjaxResult.success(tGasBottleInfoService.selectTGasBottleInfoById(bottleId));
     }
 
+    @GetMapping("/getInf")
+    public AjaxResult getInf(String bottleId)
+    {
+        /**
+         * 查询气瓶详细信息
+         */
+        TGasBottleInfo inf = tGasBottleInfoService.getInf(bottleId);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("tGasBottleInfo", inf);
+        return ajax;
+    }
+
+
     /**
      * 新增气瓶信息
      */
-    @PreAuthorize("@ss.hasPermi('gasBottle:info:add')")
+//    @PreAuthorize("@ss.hasPermi('gasBottle:info:add')")
     @Log(title = "气瓶信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TGasBottleInfo tGasBottleInfo)
@@ -85,7 +98,7 @@ public class TGasBottleInfoController extends BaseController
     /**
      * 修改气瓶信息
      */
-    @PreAuthorize("@ss.hasPermi('gasBottle:info:edit')")
+//    @PreAuthorize("@ss.hasPermi('gasBottle:info:edit')")
     @Log(title = "气瓶信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TGasBottleInfo tGasBottleInfo)
@@ -96,7 +109,7 @@ public class TGasBottleInfoController extends BaseController
     /**
      * 删除气瓶信息
      */
-    @PreAuthorize("@ss.hasPermi('gasBottle:info:remove')")
+//    @PreAuthorize("@ss.hasPermi('gasBottle:info:remove')")
     @Log(title = "气瓶信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{bottleIds}")
     public AjaxResult remove(@PathVariable Long[] bottleIds)

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TGasBottleTrackRecordController.java

 package com.zehong.web.controller.gasBottleTrack;
 
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+
+import com.zehong.system.domain.TGasBottleInfo;
+import com.zehong.system.service.ITGasBottleInfoService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -25,7 +32,8 @@ public class TGasBottleTrackRecordController extends BaseController
 {
     @Autowired
     private ITGasBottleTrackRecordService tGasBottleTrackRecordService;
-
+    @Autowired
+    private ITGasBottleInfoService tGasBottleInfoService;
     /**
      * 查询气瓶追溯列表
      */
@@ -79,6 +87,29 @@ public class TGasBottleTrackRecordController extends BaseController
         return toAjax(tGasBottleTrackRecordService.insertTGasBottleTrackRecord(tGasBottleTrackRecord));
     }
 
+
+    /**
+     * 气瓶回收信息添加
+     * @param tGasBottleTrackRecord
+     * @return
+     */
+    @PostMapping("/addTGasBottleTrackRecord")
+    public AjaxResult addTGasBottleTrackRecord(@RequestBody TGasBottleTrackRecord tGasBottleTrackRecord) throws ParseException {
+
+        //修改气瓶状态
+        TGasBottleInfo tGasBottleInfo=new TGasBottleInfo();
+        tGasBottleInfo.setBottleId(tGasBottleTrackRecord.getBottleId());
+        //设置气瓶为离站状态
+        tGasBottleInfo.setCurrentStatus("1");
+        tGasBottleInfoService.updateTGasBottleInfo(tGasBottleInfo);
+
+        DateFormat fmt =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = fmt.parse(tGasBottleTrackRecord.getOperateDates());
+        tGasBottleTrackRecord.setOperateDate(date);
+        return toAjax(tGasBottleTrackRecordService.insertTGasBottleTrackRecord(tGasBottleTrackRecord));
+    }
+
+
     /**
      * 修改气瓶追溯
      */

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TGasStorageStationInfoController.java

@@ -8,17 +8,19 @@ 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.domain.TGasUserInfolins;
 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.ArrayList;
 import java.util.List;
 
 /**
  * 储配站信息Controller
- * 
+ *
  * @author zehong
  * @date 2023-08-14
  */
@@ -32,7 +34,6 @@ public class TGasStorageStationInfoController extends BaseController
     /**
      * 查询储配站信息列表
      */
-    @PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage:list')")
     @GetMapping("/list")
     public TableDataInfo list(TGasStorageStationInfo tGasStorageStationInfo)
     {
@@ -47,6 +48,28 @@ public class TGasStorageStationInfoController extends BaseController
         return AjaxResult.success(list);
     }
 
+
+    /**
+     * 微信小程序储配站搜索接口
+     * @param tGasStorageStationInfo
+     * @return
+     */
+    @GetMapping("/storageStationlist")
+    public AjaxResult StorageStationList(TGasStorageStationInfo tGasStorageStationInfo){
+        List<TGasStorageStationInfo> tGasStorageStationInfos = tGasStorageStationInfoService.selectTGasStorageStationInfoList(tGasStorageStationInfo);
+        List list=new ArrayList();
+        for (int i=0;i<tGasStorageStationInfos.size();i++){
+            TGasUserInfolins tGasUserInfolins=new TGasUserInfolins();
+            tGasUserInfolins.setLabel(tGasStorageStationInfos.get(i).getStationName());
+            tGasUserInfolins.setValue(String.valueOf(tGasStorageStationInfos.get(i).getStationId()));
+            list.add(tGasUserInfolins);
+        }
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("list", list);
+        return ajax;
+    }
+
+
     /**
      * 导出储配站信息列表
      */

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TGasUserInfoController.java

 package com.zehong.web.controller.gasBottleTrack;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import com.zehong.system.domain.TGasBottleInfo;
+import com.zehong.system.domain.TGasUserInfolins;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,7 +27,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 燃气用户Controller
- * 
+ *
  * @author zehong
  * @date 2023-08-17
  */
@@ -77,6 +79,42 @@ public class TGasUserInfoController extends BaseController
         return AjaxResult.success(tGasUserInfoService.selectTGasUserInfoById(gasUserId));
     }
 
+
+    /**
+     * 微信小程序下拉信息查询
+     * @param tGasUserInfo
+     * @return
+     */
+    @PostMapping("/gasUserId")
+    public AjaxResult gasUserId(@RequestBody TGasUserInfo tGasUserInfo)
+    {
+        TGasUserInfo tGasUserInfo1 = tGasUserInfoService.selectTGasUserInfoById(tGasUserInfo.getGasUserId());
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("tGasUserInfon", tGasUserInfo1);
+        return ajax;
+    }
+
+    /**
+     * 小程序 查询燃气用户信息
+     * @param tGasUserInfo
+     * @return
+     */
+    @PostMapping("/gasUser")
+    public AjaxResult gasUser(@RequestBody TGasUserInfo tGasUserInfo)
+    {
+        List<TGasUserInfo> tGasUserInfos = tGasUserInfoService.gasUser(tGasUserInfo);
+        List list=new ArrayList();
+        for (int i=0;i<tGasUserInfos.size();i++){
+            TGasUserInfolins tGasUserInfolins=new TGasUserInfolins();
+            tGasUserInfolins.setLabel(tGasUserInfos.get(i).getGasUserName());
+            tGasUserInfolins.setValue(String.valueOf(tGasUserInfos.get(i).getGasUserId()));
+            list.add(tGasUserInfolins);
+        }
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("list", list);
+        ajax.put("tGasBottleInfo", tGasUserInfos);
+        return ajax;
+    }
     /**
      * 新增燃气用户
      */
@@ -88,6 +126,19 @@ public class TGasUserInfoController extends BaseController
         return toAjax(tGasUserInfoService.insertTGasUserInfo(tGasUserInfo));
     }
 
+    /**
+     * 微信小程序新增燃气用户
+     * @param tGasUserInfo
+     * @return
+     */
+    @PostMapping("/addUserInfo")
+    public AjaxResult addUserInfo(@RequestBody TGasUserInfo tGasUserInfo){
+        return toAjax(tGasUserInfoService.insertTGasUserInfo(tGasUserInfo));
+    }
+
+
+
+
     /**
      * 修改燃气用户
      */

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TPractitionerInfoController.java

@@ -2,6 +2,7 @@ package com.zehong.web.controller.gasBottleTrack;
 
 import java.util.List;
 
+import com.zehong.common.utils.SecurityUtils;
 import com.zehong.system.domain.TGasBottleInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +26,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 从业人员信息Controller
- * 
+ *
  * @author zehong
  * @date 2023-08-16
  */
@@ -71,13 +72,18 @@ public class TPractitionerInfoController extends BaseController
     /**
      * 获取从业人员信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('practitioner:info:query')")
     @GetMapping(value = "/{practitionerId}")
     public AjaxResult getInfo(@PathVariable("practitionerId") Long practitionerId)
     {
         return AjaxResult.success(tPractitionerInfoService.selectTPractitionerInfoById(practitionerId));
     }
 
+    @GetMapping(value = "/getInfo")
+    public AjaxResult getInfos(TPractitionerInfo tPractitionerInfo)
+    {
+        return AjaxResult.success(tPractitionerInfoService.selectTPractitionerInfoById(tPractitionerInfo.getPractitionerId()));
+    }
+
     /**
      * 新增从业人员信息
      */
@@ -100,6 +106,15 @@ public class TPractitionerInfoController extends BaseController
         return toAjax(tPractitionerInfoService.updateTPractitionerInfo(tPractitionerInfo));
     }
 
+
+    @RequestMapping("/updatePractitionerInfo")
+    public AjaxResult updatePractitionerInfo(TPractitionerInfo tPractitionerInfo){
+        String pass = SecurityUtils.encryptPassword(tPractitionerInfo.getPassword());
+        tPractitionerInfo.setPassword(pass);
+        return toAjax(tPractitionerInfoService.updateTPractitionerInfo(tPractitionerInfo));
+    }
+
+
     /**
      * 删除从业人员信息
      */

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TSafeCheckRecordController.java

 package com.zehong.web.controller.gasBottleTrack;
 
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+
+import com.zehong.system.domain.TGasBottleInfo;
+import com.zehong.system.service.ITGasBottleInfoService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,7 +30,7 @@ import com.zehong.common.core.page.TableDataInfo;
 
 /**
  * 安检记录Controller
- * 
+ *
  * @author zehong
  * @date 2023-08-21
  */
@@ -33,6 +41,8 @@ public class TSafeCheckRecordController extends BaseController
     @Autowired
     private ITSafeCheckRecordService tSafeCheckRecordService;
 
+
+
     /**
      * 查询安检记录列表
      */
@@ -71,7 +81,6 @@ public class TSafeCheckRecordController extends BaseController
     /**
      * 新增安检记录
      */
-    @PreAuthorize("@ss.hasPermi('safe:record:add')")
     @Log(title = "安检记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TSafeCheckRecord tSafeCheckRecord)
@@ -79,6 +88,21 @@ public class TSafeCheckRecordController extends BaseController
         return toAjax(tSafeCheckRecordService.insertTSafeCheckRecord(tSafeCheckRecord));
     }
 
+
+    /**
+     * 安检记录添加 微信小程序调用接口
+     */
+    @PostMapping("/addInfo")
+    public AjaxResult addInfo(@RequestBody TSafeCheckRecord tSafeCheckRecord) throws ParseException {
+        DateFormat fmt =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        Date date = fmt.parse(tSafeCheckRecord.getSafeCheckDates());
+        tSafeCheckRecord.setSafeCheckDate(date);
+
+        return toAjax(tSafeCheckRecordService.insertTSafeCheckRecord(tSafeCheckRecord));
+    }
+
+
     /**
      * 修改安检记录
      */

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TDeviceInfoController.java

 package com.zehong.web.controller.supervise;
 
 import java.io.File;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -247,11 +248,14 @@ public class TDeviceInfoController extends BaseController
     @GetMapping("/selectDeviceNum")
     public AjaxResult selectDeviceNum(String enterpriseId)
     {
-        Map<String,Object> map = itDetectorInfoService.selectDetectorNum(enterpriseId);
-        Map<String,Object> map1 =tDeviceInfoService.selectDeviceNum(enterpriseId);
-        Map<String,Object> map2 =itDetectorUserService.selectUserNum();
-        map.putAll(map2);
-        map.putAll(map1);
+        if (enterpriseId!=null){
+            Map<String,Object> map = itDetectorInfoService.selectDetectorNum(enterpriseId);
+            Map<String,Object> map1 =tDeviceInfoService.selectDeviceNum(enterpriseId);
+            Map<String,Object> map2 =itDetectorUserService.selectUserNum();
+            map.putAll(map1);
+            return  AjaxResult.success(map);
+        }
+        Map<String,Object> map=new HashMap<>();
         return  AjaxResult.success(map);
     }
 }

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/system/SysLoginController.java

@@ -6,7 +6,9 @@ import java.util.Set;
 
 import com.zehong.framework.systemsetting.SystemSetting;
 import com.zehong.framework.web.domain.server.Sys;
+import com.zehong.system.domain.TPractitionerInfo;
 import com.zehong.system.service.ISysPostService;
+import com.zehong.system.service.ITPractitionerInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -50,6 +52,9 @@ public class SysLoginController
     @Autowired
     private ISysPostService iSysPostService;
 
+    @Autowired
+    private ITPractitionerInfoService tPractitionerInfoService;
+
     /**
      * 登录方法
      *
@@ -67,6 +72,26 @@ public class SysLoginController
         return ajax;
     }
 
+    /**
+     * 从业人员登录方法
+     */
+    @PostMapping("/loginTPractitioner")
+    public AjaxResult loginTPractitioner(@RequestBody TPractitionerInfo tPractitionerInfo){
+        /**
+         * 查询登录信息
+         */
+//        List<TPractitionerInfo> tPractitionerInfos = tPractitionerInfoService.loginTPractitioner(tPractitionerInfo);
+        tPractitionerInfo.setTelNum(tPractitionerInfo.getTelNum()+"Y");
+        AjaxResult ajax = AjaxResult.success();
+        // 生成令牌
+        String token = loginService.login(tPractitionerInfo.getTelNum(), tPractitionerInfo.getPassword(), tPractitionerInfo.getCode(),
+                tPractitionerInfo.getUuid());
+        ajax.put(Constants.TOKEN, token);
+        return ajax;
+    }
+
+
+
     /**
      * 获取用户信息
      *
@@ -82,10 +107,14 @@ public class SysLoginController
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
 
+        HashMap hashMap=new HashMap();
+        hashMap.put("map_center","[115.66,39.02]");
+        hashMap.put("prod_test","prod");
         AjaxResult ajax = AjaxResult.success();
         ajax.put("user", user);
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);
+        ajax.put("systemSetting",hashMap);
         ajax.put("posts",iSysPostService.getPostListByUserId(user.getUserId()));
         ajax.put("systemSetting",systemSetting.getSystemWebSetting());
         return ajax;

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/system/TDeliveryRecordController.java

@@ -79,6 +79,18 @@ public class TDeliveryRecordController extends BaseController
         return toAjax(tDeliveryRecordService.insertTDeliveryRecord(tDeliveryRecord));
     }
 
+    /**
+     * 新增配送记录
+     * @param tDeliveryRecord
+     * @return
+     */
+    @PostMapping("/addRecord")
+    public AjaxResult addRecord(@RequestBody TDeliveryRecord tDeliveryRecord)
+    {
+        return toAjax(tDeliveryRecordService.insertTDeliveryRecord(tDeliveryRecord));
+    }
+
+
     /**
      * 修改配送记录
      */

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/system/TVehicleInfosController.java

@@ -7,14 +7,7 @@ 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 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;
@@ -85,6 +78,19 @@ public class TVehicleInfosController extends BaseController
         return AjaxResult.success(tVehicleInfoService.selectTVehicleInfoById(vehicleId));
     }
 
+    /**
+     * 微信小程序  车辆详细信息查询接口
+     * @param tVehicleInfo
+     * @return
+     */
+    @PostMapping("/getTVehicleInfo")
+    public AjaxResult getTVehicleInfo(@RequestBody TVehicleInfo tVehicleInfo)
+    {
+        TVehicleInfo tVehicleInfo1 = tVehicleInfoService.getTVehicleInfo(tVehicleInfo);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("tGasBottleInfo", tVehicleInfo1);
+        return ajax;
+    }
     /**
      * 新增燃气车辆信息
      */

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/system/TVehicleUseRecordController.java

 package com.zehong.web.controller.system;
 
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 import com.zehong.common.core.domain.model.LoginUser;
@@ -87,6 +91,24 @@ public class TVehicleUseRecordController extends BaseController
         return toAjax(tVehicleUseRecordService.insertTVehicleUseRecord(tVehicleUseRecord));
     }
 
+    /**
+     * 微信小程序 车辆使用信息提交
+     * @param tVehicleUseRecord
+     * @return
+     */
+    @PostMapping("/addtVehicleUseRecord")
+    public AjaxResult addtVehicleUseRecord(@RequestBody TVehicleUseRecord tVehicleUseRecord) throws ParseException {
+//        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getUser().getUserId();
+//        tVehicleUseRecord.setVehicleUserId(userId);
+        DateFormat fmt =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date VehicleUseDateTime = fmt.parse(tVehicleUseRecord.getVehicleUseDateTime());
+        Date parse = fmt.parse(tVehicleUseRecord.getVehicleReturnDateTime());
+        tVehicleUseRecord.setVehicleUseDate(VehicleUseDateTime);
+        tVehicleUseRecord.setVehicleReturnDate(parse);
+        return toAjax(tVehicleUseRecordService.insertTVehicleUseRecord(tVehicleUseRecord));
+    }
+
     /**
      * 修改车辆使用记录
      */

gassafetyprogress-common/src/main/java/com/zehong/common/core/domain/entity/SysUser.java

@@ -17,7 +17,7 @@ import com.zehong.common.core.domain.BaseEntity;
 
 /**
  * 用户对象 sys_user
- * 
+ *
  * @author zehong
  */
 public class SysUser extends BaseEntity
@@ -98,6 +98,22 @@ public class SysUser extends BaseEntity
 
     private String enterpriseId;
 
+    /**储配站*/
+    private String stationName;
+
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
     public String getEnterpriseId() {
         return enterpriseId;
     }

gassafetyprogress-framework/src/main/java/com/zehong/framework/config/SecurityConfig.java

@@ -114,6 +114,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/webjars/**").anonymous()
                 .antMatchers("/*/api-docs").anonymous()
                 .antMatchers("/druid/**").anonymous()
+//                .antMatchers("/charge/record/list").anonymous()
+
+                .antMatchers("/loginTPractitioner").anonymous()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()

gassafetyprogress-framework/src/main/java/com/zehong/framework/web/service/SysLoginService.java

@@ -25,7 +25,7 @@ import com.zehong.system.service.ISysUserService;
 
 /**
  * 登录校验方法
- * 
+ *
  * @author zehong
  */
 @Component
@@ -39,13 +39,13 @@ public class SysLoginService
 
     @Autowired
     private RedisCache redisCache;
-    
+
     @Autowired
     private ISysUserService userService;
 
     /**
      * 登录验证
-     * 
+     *
      * @param username 用户名
      * @param password 密码
      * @param code 验证码
@@ -107,4 +107,5 @@ public class SysLoginService
         user.setLoginDate(DateUtils.getNowDate());
         userService.updateUserProfile(user);
     }
+
 }

gassafetyprogress-framework/src/main/java/com/zehong/framework/web/service/UserDetailsServiceImpl.java

 package com.zehong.framework.web.service;
 
+import com.zehong.system.domain.TPractitionerInfo;
+import com.zehong.system.service.ITPractitionerInfoService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +16,8 @@ import com.zehong.common.exception.BaseException;
 import com.zehong.common.utils.StringUtils;
 import com.zehong.system.service.ISysUserService;
 
+import java.util.List;
+
 /**
  * 用户验证处理
  *
@@ -30,27 +34,58 @@ public class UserDetailsServiceImpl implements UserDetailsService
     @Autowired
     private SysPermissionService permissionService;
 
+    @Autowired
+    private ITPractitionerInfoService tPractitionerInfoService;
+
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
     {
-        SysUser user = userService.selectUserByUserName(username);
-        if (StringUtils.isNull(user))
-        {
-            log.info("登录用户：{} 不存在.", username);
-            throw new UsernameNotFoundException("登录用户：" + username + " 不存在");
-        }
-        else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
-        {
-            log.info("登录用户：{} 已被删除.", username);
-            throw new BaseException("对不起，您的账号：" + username + " 已被删除");
-        }
-        else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
-        {
-            log.info("登录用户：{} 已被停用.", username);
-            throw new BaseException("对不起，您的账号：" + username + " 已停用");
+        String lastChar = String.valueOf(username.charAt(username.length() - 1));
+        if (lastChar.equals("Y")){
+            String usernames = StringUtils.substringBefore(username, "Y");
+            TPractitionerInfo tPractitionerInfo=new TPractitionerInfo();
+            tPractitionerInfo.setTelNum(usernames);
+            /**
+             * 查询登录信息
+             */
+            List<TPractitionerInfo> tPractitionerInfos = tPractitionerInfoService.loginTPractitioner(tPractitionerInfo);
+            if (tPractitionerInfos.size()<=0){
+                log.info("登录用户：{} 不存在.", usernames);
+                throw new UsernameNotFoundException("登录用户：" + usernames + " 不存在");
+            }else {
+                SysUser user=new SysUser();
+                user.setUserName(tPractitionerInfos.get(0).getTelNum());
+                user.setPassword(tPractitionerInfos.get(0).getPassword());
+                user.setNickName(tPractitionerInfos.get(0).getName());
+                user.setAvatar(tPractitionerInfos.get(0).getPersonPhoto());
+                user.setStationName(tPractitionerInfos.get(0).getStationName());
+                user.setUserId(tPractitionerInfos.get(0).getPractitionerId());
+                user.setDeptId(Long.valueOf(-2));
+                return createLoginUser(user);
+            }
+        }else {
+            System.out.println(username);
+            SysUser user = userService.selectUserByUserName(username);
+
+            if (StringUtils.isNull(user))
+            {
+                log.info("登录用户：{} 不存在.", username);
+                throw new UsernameNotFoundException("登录用户：" + username + " 不存在");
+            }
+            else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
+            {
+                log.info("登录用户：{} 已被删除.", username);
+                throw new BaseException("对不起，您的账号：" + username + " 已被删除");
+            }
+            else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
+            {
+                log.info("登录用户：{} 已被停用.", username);
+                throw new BaseException("对不起，您的账号：" + username + " 已停用");
+            }
+            System.out.println(user);
+            return createLoginUser(user);
         }
 
-        return createLoginUser(user);
     }
 
     public UserDetails createLoginUser(SysUser user)

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TAirChargeRecord.java

@@ -9,7 +9,7 @@ import com.zehong.common.core.domain.BaseEntity;
 
 /**
  * 充装记录对象 t_air_charge_record
- * 
+ *
  * @author zehong
  * @date 2023-08-21
  */
@@ -51,6 +51,8 @@ public class TAirChargeRecord extends BaseEntity
     @Excel(name = "充装时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date chargeDate;
 
+    private String chargeDates;
+
     /** 删除状态：0.否 1.是 */
     private String isDel;
 
@@ -58,25 +60,37 @@ public class TAirChargeRecord extends BaseEntity
 
     private Date chargeEndTime;
 
-    public void setChargeRecordId(Long chargeRecordId) 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getChargeDates() {
+        return chargeDates;
+    }
+
+    public void setChargeDates(String chargeDates) {
+        this.chargeDates = chargeDates;
+    }
+
+    public void setChargeRecordId(Long chargeRecordId)
     {
         this.chargeRecordId = chargeRecordId;
     }
 
-    public Long getChargeRecordId() 
+    public Long getChargeRecordId()
     {
         return chargeRecordId;
     }
-    public void setStationId(Long stationId) 
+    public void setStationId(Long stationId)
     {
         this.stationId = stationId;
     }
 
-    public Long getStationId() 
+    public Long getStationId()
     {
         return stationId;
     }
-    public void setBottleId(Long bottleId) 
+    public void setBottleId(Long bottleId)
     {
         this.bottleId = bottleId;
     }
@@ -125,39 +139,39 @@ public class TAirChargeRecord extends BaseEntity
     {
         return bottleId;
     }
-    public void setChargeOperator(Long chargeOperator) 
+    public void setChargeOperator(Long chargeOperator)
     {
         this.chargeOperator = chargeOperator;
     }
 
-    public Long getChargeOperator() 
+    public Long getChargeOperator()
     {
         return chargeOperator;
     }
-    public void setChargeMeasure(String chargeMeasure) 
+    public void setChargeMeasure(String chargeMeasure)
     {
         this.chargeMeasure = chargeMeasure;
     }
 
-    public String getChargeMeasure() 
+    public String getChargeMeasure()
     {
         return chargeMeasure;
     }
-    public void setChargeDate(Date chargeDate) 
+    public void setChargeDate(Date chargeDate)
     {
         this.chargeDate = chargeDate;
     }
 
-    public Date getChargeDate() 
+    public Date getChargeDate()
     {
         return chargeDate;
     }
-    public void setIsDel(String isDel) 
+    public void setIsDel(String isDel)
     {
         this.isDel = isDel;
     }
 
-    public String getIsDel() 
+    public String getIsDel()
     {
         return isDel;
     }

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TDeliveryRecord.java

@@ -46,7 +46,7 @@ public class TDeliveryRecord extends BaseEntity
 
     /** 配送时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "配送时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "配送时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date deliveryDate;
 
     /** 删除状态：0.否 1.是 */

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TGasBottleTrackRecord.java

@@ -9,7 +9,7 @@ import com.zehong.common.core.domain.BaseEntity;
 
 /**
  * 气瓶追溯对象 t_gas_bottle_track_record
- * 
+ *
  * @author zehong
  * @date 2023-08-18
  */
@@ -50,8 +50,9 @@ public class TGasBottleTrackRecord extends BaseEntity
     @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date operateDate;
 
-    /** 操作人 */
+    private String operateDates;
 
+    /** 操作人 */
     private Long operator;
 
     @Excel(name = "操作人")
@@ -70,30 +71,42 @@ public class TGasBottleTrackRecord extends BaseEntity
 
     private String messageInfo;
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getOperateDates() {
+        return operateDates;
+    }
+
+    public void setOperateDates(String operateDates) {
+        this.operateDates = operateDates;
+    }
+
     public void setTrackRecordId(Long trackRecordId)
     {
         this.trackRecordId = trackRecordId;
     }
 
-    public Long getTrackRecordId() 
+    public Long getTrackRecordId()
     {
         return trackRecordId;
     }
-    public void setStationId(Long stationId) 
+    public void setStationId(Long stationId)
     {
         this.stationId = stationId;
     }
 
-    public Long getStationId() 
+    public Long getStationId()
     {
         return stationId;
     }
-    public void setBottleId(Long bottleId) 
+    public void setBottleId(Long bottleId)
     {
         this.bottleId = bottleId;
     }
 
-    public Long getBottleId() 
+    public Long getBottleId()
     {
         return bottleId;
     }
@@ -119,34 +132,34 @@ public class TGasBottleTrackRecord extends BaseEntity
         this.processesName = processesName;
     }
 
-    public String getProcessesName() 
+    public String getProcessesName()
     {
         return processesName;
     }
-    public void setProcessesRelationId(Long processesRelationId) 
+    public void setProcessesRelationId(Long processesRelationId)
     {
         this.processesRelationId = processesRelationId;
     }
 
-    public Long getProcessesRelationId() 
+    public Long getProcessesRelationId()
     {
         return processesRelationId;
     }
-    public void setOperateDate(Date operateDate) 
+    public void setOperateDate(Date operateDate)
     {
         this.operateDate = operateDate;
     }
 
-    public Date getOperateDate() 
+    public Date getOperateDate()
     {
         return operateDate;
     }
-    public void setOperator(Long operator) 
+    public void setOperator(Long operator)
     {
         this.operator = operator;
     }
 
-    public Long getOperator() 
+    public Long getOperator()
     {
         return operator;
     }
@@ -164,25 +177,25 @@ public class TGasBottleTrackRecord extends BaseEntity
         this.sender = sender;
     }
 
-    public String getSender() 
+    public String getSender()
     {
         return sender;
     }
-    public void setRecipient(String recipient) 
+    public void setRecipient(String recipient)
     {
         this.recipient = recipient;
     }
 
-    public String getRecipient() 
+    public String getRecipient()
     {
         return recipient;
     }
-    public void setIsDel(String isDel) 
+    public void setIsDel(String isDel)
     {
         this.isDel = isDel;
     }
 
-    public String getIsDel() 
+    public String getIsDel()
     {
         return isDel;
     }
@@ -205,20 +218,23 @@ public class TGasBottleTrackRecord extends BaseEntity
 
     @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();
+        return "TGasBottleTrackRecord{" +
+                "trackRecordId=" + trackRecordId +
+                ", stationId=" + stationId +
+                ", stationName='" + stationName + '\'' +
+                ", bottleId=" + bottleId +
+                ", bottleCode='" + bottleCode + '\'' +
+                ", bottleCapacity='" + bottleCapacity + '\'' +
+                ", processesName='" + processesName + '\'' +
+                ", processesRelationId=" + processesRelationId +
+                ", operateDate=" + operateDate +
+                ", operateDates='" + operateDates + '\'' +
+                ", operator=" + operator +
+                ", operatorName='" + operatorName + '\'' +
+                ", sender='" + sender + '\'' +
+                ", recipient='" + recipient + '\'' +
+                ", isDel='" + isDel + '\'' +
+                ", messageInfo='" + messageInfo + '\'' +
+                '}';
     }
 }

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TGasUserInfolins.java

+package com.zehong.system.domain;
+
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * 微信小程序下拉选择信息封装类
+ */
+@Data
+@ToString
+public class TGasUserInfolins {
+
+    private String label;
+
+    private String value;
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TPractitionerInfo.java

@@ -9,7 +9,7 @@ import com.zehong.common.core.domain.BaseEntity;
 
 /**
  * 从业人员信息对象 t_practitioner_info
- * 
+ *
  * @author zehong
  * @date 2023-08-16
  */
@@ -21,7 +21,6 @@ public class TPractitionerInfo extends BaseEntity
     private Long practitionerId;
 
     /** 储配站 */
-
     private Long stationId;
 
     @Excel(name = "储配站")
@@ -83,138 +82,169 @@ public class TPractitionerInfo extends BaseEntity
     /** 删除状态：0.否 1.是 */
     private String isDel;
 
-    public void setPractitionerId(Long practitionerId) 
+    /**
+     * 验证码
+     */
+    private String code;
+
+    /**
+     * 唯一标识
+     */
+    private String uuid = "";
+
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public void setPractitionerId(Long practitionerId)
     {
         this.practitionerId = practitionerId;
     }
 
-    public Long getPractitionerId() 
+    public Long getPractitionerId()
     {
         return practitionerId;
     }
-    public void setStationId(Long stationId) 
+    public void setStationId(Long stationId)
     {
         this.stationId = stationId;
     }
 
-    public Long getStationId() 
+    public Long getStationId()
     {
         return stationId;
     }
-    public void setPractitionerNum(String practitionerNum) 
+    public void setPractitionerNum(String practitionerNum)
     {
         this.practitionerNum = practitionerNum;
     }
 
-    public String getPractitionerNum() 
+    public String getPractitionerNum()
     {
         return practitionerNum;
     }
-    public void setName(String name) 
+    public void setName(String name)
     {
         this.name = name;
     }
 
-    public String getName() 
+    public String getName()
     {
         return name;
     }
-    public void setSex(String sex) 
+    public void setSex(String sex)
     {
         this.sex = sex;
     }
 
-    public String getSex() 
+    public String getSex()
     {
         return sex;
     }
-    public void setBirthDate(Date birthDate) 
+    public void setBirthDate(Date birthDate)
     {
         this.birthDate = birthDate;
     }
 
-    public Date getBirthDate() 
+    public Date getBirthDate()
     {
         return birthDate;
     }
-    public void setPostId(Long postId) 
+    public void setPostId(Long postId)
     {
         this.postId = postId;
     }
 
-    public Long getPostId() 
+    public Long getPostId()
     {
         return postId;
     }
-    public void setTelNum(String telNum) 
+    public void setTelNum(String telNum)
     {
         this.telNum = telNum;
     }
 
-    public String getTelNum() 
+    public String getTelNum()
     {
         return telNum;
     }
-    public void setDeliveryArea(String deliveryArea) 
+    public void setDeliveryArea(String deliveryArea)
     {
         this.deliveryArea = deliveryArea;
     }
 
-    public String getDeliveryArea() 
+    public String getDeliveryArea()
     {
         return deliveryArea;
     }
-    public void setPersonPhoto(String personPhoto) 
+    public void setPersonPhoto(String personPhoto)
     {
         this.personPhoto = personPhoto;
     }
 
-    public String getPersonPhoto() 
+    public String getPersonPhoto()
     {
         return personPhoto;
     }
-    public void setLicenseFile(String licenseFile) 
+    public void setLicenseFile(String licenseFile)
     {
         this.licenseFile = licenseFile;
     }
 
-    public String getLicenseFile() 
+    public String getLicenseFile()
     {
         return licenseFile;
     }
-    public void setCertificateNum(String certificateNum) 
+    public void setCertificateNum(String certificateNum)
     {
         this.certificateNum = certificateNum;
     }
 
-    public String getCertificateNum() 
+    public String getCertificateNum()
     {
         return certificateNum;
     }
-    public void setCertificateEffectiveDate(Date certificateEffectiveDate) 
+    public void setCertificateEffectiveDate(Date certificateEffectiveDate)
     {
         this.certificateEffectiveDate = certificateEffectiveDate;
     }
 
-    public Date getCertificateEffectiveDate() 
+    public Date getCertificateEffectiveDate()
     {
         return certificateEffectiveDate;
     }
-    public void setPassword(String password) 
+    public void setPassword(String password)
     {
         this.password = password;
     }
 
-    public String getPassword() 
+    public String getPassword()
     {
         return password;
     }
-    public void setIsDel(String isDel) 
+    public void setIsDel(String isDel)
     {
         this.isDel = isDel;
     }
 
-    public String getIsDel() 
+    public String getIsDel()
     {
         return isDel;
     }
@@ -237,25 +267,26 @@ public class TPractitionerInfo extends BaseEntity
 
     @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();
+        return "TPractitionerInfo{" +
+                "practitionerId=" + practitionerId +
+                ", stationId=" + stationId +
+                ", stationName='" + stationName + '\'' +
+                ", practitionerNum='" + practitionerNum + '\'' +
+                ", name='" + name + '\'' +
+                ", sex='" + sex + '\'' +
+                ", birthDate=" + birthDate +
+                ", postId=" + postId +
+                ", postName='" + postName + '\'' +
+                ", telNum='" + telNum + '\'' +
+                ", deliveryArea='" + deliveryArea + '\'' +
+                ", personPhoto='" + personPhoto + '\'' +
+                ", licenseFile='" + licenseFile + '\'' +
+                ", certificateNum='" + certificateNum + '\'' +
+                ", certificateEffectiveDate=" + certificateEffectiveDate +
+                ", password='" + password + '\'' +
+                ", isDel='" + isDel + '\'' +
+                ", code='" + code + '\'' +
+                ", uuid='" + uuid + '\'' +
+                '}';
     }
 }

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TSafeCheckRecord.java

@@ -9,7 +9,7 @@ import com.zehong.common.core.domain.BaseEntity;
 
 /**
  * 安检记录对象 t_safe_check_record
- * 
+ *
  * @author zehong
  * @date 2023-08-21
  */
@@ -45,6 +45,8 @@ public class TSafeCheckRecord extends BaseEntity
     @Excel(name = "安检时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date safeCheckDate;
 
+    private String safeCheckDates;
+
     /** 安检人 */
     private Long safeCheckPerson;
 
@@ -125,25 +127,37 @@ public class TSafeCheckRecord extends BaseEntity
 
     private Date safeCheckEndTime;
 
-    public void setSafeCheckId(Long safeCheckId) 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getSafeCheckDates() {
+        return safeCheckDates;
+    }
+
+    public void setSafeCheckDates(String safeCheckDates) {
+        this.safeCheckDates = safeCheckDates;
+    }
+
+    public void setSafeCheckId(Long safeCheckId)
     {
         this.safeCheckId = safeCheckId;
     }
 
-    public Long getSafeCheckId() 
+    public Long getSafeCheckId()
     {
         return safeCheckId;
     }
-    public void setStationId(Long stationId) 
+    public void setStationId(Long stationId)
     {
         this.stationId = stationId;
     }
 
-    public Long getStationId() 
+    public Long getStationId()
     {
         return stationId;
     }
-    public void setGasUserId(Long gasUserId) 
+    public void setGasUserId(Long gasUserId)
     {
         this.gasUserId = gasUserId;
     }
@@ -192,25 +206,25 @@ public class TSafeCheckRecord extends BaseEntity
     {
         return gasUserId;
     }
-    public void setSafeCheckDate(Date safeCheckDate) 
+    public void setSafeCheckDate(Date safeCheckDate)
     {
         this.safeCheckDate = safeCheckDate;
     }
 
-    public Date getSafeCheckDate() 
+    public Date getSafeCheckDate()
     {
         return safeCheckDate;
     }
-    public void setSafeCheckPerson(Long safeCheckPerson) 
+    public void setSafeCheckPerson(Long safeCheckPerson)
     {
         this.safeCheckPerson = safeCheckPerson;
     }
 
-    public Long getSafeCheckPerson() 
+    public Long getSafeCheckPerson()
     {
         return safeCheckPerson;
     }
-    public void setBottleNum(Integer bottleNum) 
+    public void setBottleNum(Integer bottleNum)
     {
         this.bottleNum = bottleNum;
     }
@@ -227,147 +241,147 @@ public class TSafeCheckRecord extends BaseEntity
     {
         return bottleNum;
     }
-    public void setCheckInStatus(String checkInStatus) 
+    public void setCheckInStatus(String checkInStatus)
     {
         this.checkInStatus = checkInStatus;
     }
 
-    public String getCheckInStatus() 
+    public String getCheckInStatus()
     {
         return checkInStatus;
     }
-    public void setStoveCheckStatus(String stoveCheckStatus) 
+    public void setStoveCheckStatus(String stoveCheckStatus)
     {
         this.stoveCheckStatus = stoveCheckStatus;
     }
 
-    public String getStoveCheckStatus() 
+    public String getStoveCheckStatus()
     {
         return stoveCheckStatus;
     }
-    public void setStoveCheckPic(String stoveCheckPic) 
+    public void setStoveCheckPic(String stoveCheckPic)
     {
         this.stoveCheckPic = stoveCheckPic;
     }
 
-    public String getStoveCheckPic() 
+    public String getStoveCheckPic()
     {
         return stoveCheckPic;
     }
-    public void setHoseCheckStatus(String hoseCheckStatus) 
+    public void setHoseCheckStatus(String hoseCheckStatus)
     {
         this.hoseCheckStatus = hoseCheckStatus;
     }
 
-    public String getHoseCheckStatus() 
+    public String getHoseCheckStatus()
     {
         return hoseCheckStatus;
     }
-    public void setHoseCheckPic(String hoseCheckPic) 
+    public void setHoseCheckPic(String hoseCheckPic)
     {
         this.hoseCheckPic = hoseCheckPic;
     }
 
-    public String getHoseCheckPic() 
+    public String getHoseCheckPic()
     {
         return hoseCheckPic;
     }
-    public void setValveCheckStatus(String valveCheckStatus) 
+    public void setValveCheckStatus(String valveCheckStatus)
     {
         this.valveCheckStatus = valveCheckStatus;
     }
 
-    public String getValveCheckStatus() 
+    public String getValveCheckStatus()
     {
         return valveCheckStatus;
     }
-    public void setValveCheckPic(String valveCheckPic) 
+    public void setValveCheckPic(String valveCheckPic)
     {
         this.valveCheckPic = valveCheckPic;
     }
 
-    public String getValveCheckPic() 
+    public String getValveCheckPic()
     {
         return valveCheckPic;
     }
-    public void setBottleCheckStatus(String bottleCheckStatus) 
+    public void setBottleCheckStatus(String bottleCheckStatus)
     {
         this.bottleCheckStatus = bottleCheckStatus;
     }
 
-    public String getBottleCheckStatus() 
+    public String getBottleCheckStatus()
     {
         return bottleCheckStatus;
     }
-    public void setBottleCheckPic(String bottleCheckPic) 
+    public void setBottleCheckPic(String bottleCheckPic)
     {
         this.bottleCheckPic = bottleCheckPic;
     }
 
-    public String getBottleCheckPic() 
+    public String getBottleCheckPic()
     {
         return bottleCheckPic;
     }
-    public void setAlarmCheckStatus(String alarmCheckStatus) 
+    public void setAlarmCheckStatus(String alarmCheckStatus)
     {
         this.alarmCheckStatus = alarmCheckStatus;
     }
 
-    public String getAlarmCheckStatus() 
+    public String getAlarmCheckStatus()
     {
         return alarmCheckStatus;
     }
-    public void setAlarmCheckPic(String alarmCheckPic) 
+    public void setAlarmCheckPic(String alarmCheckPic)
     {
         this.alarmCheckPic = alarmCheckPic;
     }
 
-    public String getAlarmCheckPic() 
+    public String getAlarmCheckPic()
     {
         return alarmCheckPic;
     }
-    public void setPlaceCheckStatus(String placeCheckStatus) 
+    public void setPlaceCheckStatus(String placeCheckStatus)
     {
         this.placeCheckStatus = placeCheckStatus;
     }
 
-    public String getPlaceCheckStatus() 
+    public String getPlaceCheckStatus()
     {
         return placeCheckStatus;
     }
-    public void setPlaceCheckPic(String placeCheckPic) 
+    public void setPlaceCheckPic(String placeCheckPic)
     {
         this.placeCheckPic = placeCheckPic;
     }
 
-    public String getPlaceCheckPic() 
+    public String getPlaceCheckPic()
     {
         return placeCheckPic;
     }
-    public void setCheckPersonSign(String checkPersonSign) 
+    public void setCheckPersonSign(String checkPersonSign)
     {
         this.checkPersonSign = checkPersonSign;
     }
 
-    public String getCheckPersonSign() 
+    public String getCheckPersonSign()
     {
         return checkPersonSign;
     }
-    public void setGasUserSign(String gasUserSign) 
+    public void setGasUserSign(String gasUserSign)
     {
         this.gasUserSign = gasUserSign;
     }
 
-    public String getGasUserSign() 
+    public String getGasUserSign()
     {
         return gasUserSign;
     }
-    public void setIsDel(String isDel) 
+    public void setIsDel(String isDel)
     {
         this.isDel = isDel;
     }
 
-    public String getIsDel() 
+    public String getIsDel()
     {
         return isDel;
     }

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TVehicleInfo.java

@@ -20,6 +20,12 @@ public class TVehicleInfo extends BaseEntity
     /** 车辆id */
     private Long vehicleId;
 
+    /**
+     * 车辆编号
+     */
+    @Excel(name = "车辆编号")
+    private String carNumber;
+
     /** 车牌号 */
     @Excel(name = "车牌号")
     private String carNum;
@@ -79,6 +85,13 @@ public class TVehicleInfo extends BaseEntity
 
     private String beyondEnterpriseName;
 
+    public String getCarNumber() {
+        return carNumber;
+    }
+
+    public void setCarNumber(String carNumber) {
+        this.carNumber = carNumber;
+    }
 
     public String getSiteStationName() {
         return siteStationName;
@@ -236,20 +249,25 @@ public class TVehicleInfo extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("vehicleId", getVehicleId())
-            .append("carNum", getCarNum())
-            .append("brandModel", getBrandModel())
-            .append("vehicleType", getVehicleType())
-            .append("vehicleLoad", getVehicleLoad())
-            .append("vehicleSize", getVehicleSize())
-            .append("vehicleLimt", getVehicleLimt())
-            .append("vehicleInspect", getVehicleInspect())
-            .append("beyondEnterpriseId", getBeyondEnterpriseId())
-            .append("personLiable", getPersonLiable())
-            .append("phone", getPhone())
-            .append("isDel", getIsDel())
-            .append("remarks", getRemarks())
-            .toString();
+        return "TVehicleInfo{" +
+                "vehicleId=" + vehicleId +
+                ", carNumber='" + carNumber + '\'' +
+                ", carNum='" + carNum + '\'' +
+                ", brandModel='" + brandModel + '\'' +
+                ", vehicleType='" + vehicleType + '\'' +
+                ", vehicleLoad='" + vehicleLoad + '\'' +
+                ", vehicleSize='" + vehicleSize + '\'' +
+                ", vehicleLimt='" + vehicleLimt + '\'' +
+                ", vehicleInspect='" + vehicleInspect + '\'' +
+                ", beyondEnterpriseId=" + beyondEnterpriseId +
+                ", personLiable='" + personLiable + '\'' +
+                ", phone='" + phone + '\'' +
+                ", isDel='" + isDel + '\'' +
+                ", remarks='" + remarks + '\'' +
+                ", siteStationName='" + siteStationName + '\'' +
+                ", longitude=" + longitude +
+                ", latitude=" + latitude +
+                ", beyondEnterpriseName='" + beyondEnterpriseName + '\'' +
+                '}';
     }
 }

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TVehicleUseRecord.java

@@ -61,10 +61,31 @@ public class TVehicleUseRecord extends BaseEntity
     @Excel(name = "归还时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date vehicleReturnDate;
 
+    /**使用时间*/
+    private String vehicleUseDateTime;
+    /**归还时间*/
+    private String vehicleReturnDateTime;
+
     /** 删除状态：0.否 1.是 */
     @Excel(name = "删除状态：0.否 1.是")
     private String isDel;
 
+    public String getVehicleUseDateTime() {
+        return vehicleUseDateTime;
+    }
+
+    public void setVehicleUseDateTime(String vehicleUseDateTime) {
+        this.vehicleUseDateTime = vehicleUseDateTime;
+    }
+
+    public String getVehicleReturnDateTime() {
+        return vehicleReturnDateTime;
+    }
+
+    public void setVehicleReturnDateTime(String vehicleReturnDateTime) {
+        this.vehicleReturnDateTime = vehicleReturnDateTime;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TGasBottleInfoMapper.java

@@ -7,15 +7,15 @@ import java.util.List;
 
 /**
  * 气瓶信息Mapper接口
- * 
+ *
  * @author zehong
  * @date 2023-08-15
  */
-public interface TGasBottleInfoMapper 
+public interface TGasBottleInfoMapper
 {
     /**
      * 查询气瓶信息
-     * 
+     *
      * @param bottleId 气瓶信息ID
      * @return 气瓶信息
      */
@@ -23,7 +23,7 @@ public interface TGasBottleInfoMapper
 
     /**
      * 查询气瓶信息列表
-     * 
+     *
      * @param tGasBottleInfo 气瓶信息
      * @return 气瓶信息集合
      */
@@ -31,7 +31,7 @@ public interface TGasBottleInfoMapper
 
     /**
      * 新增气瓶信息
-     * 
+     *
      * @param tGasBottleInfo 气瓶信息
      * @return 结果
      */
@@ -39,7 +39,7 @@ public interface TGasBottleInfoMapper
 
     /**
      * 修改气瓶信息
-     * 
+     *
      * @param tGasBottleInfo 气瓶信息
      * @return 结果
      */
@@ -47,7 +47,7 @@ public interface TGasBottleInfoMapper
 
     /**
      * 删除气瓶信息
-     * 
+     *
      * @param bottleId 气瓶信息ID
      * @return 结果
      */
@@ -55,7 +55,7 @@ public interface TGasBottleInfoMapper
 
     /**
      * 批量删除气瓶信息
-     * 
+     *
      * @param bottleIds 需要删除的数据ID
      * @return 结果
      */
@@ -67,4 +67,11 @@ public interface TGasBottleInfoMapper
      * @return
      */
     List<BottleStatistics> bottleStatistics(Long stationId);
+
+    /**
+     * 查询气瓶详细信息
+     * @param bottleId
+     * @return
+     */
+    TGasBottleInfo getInf(String bottleId);
 }

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TGasUserInfoMapper.java

@@ -5,15 +5,15 @@ import com.zehong.system.domain.TGasUserInfo;
 
 /**
  * 燃气用户Mapper接口
- * 
+ *
  * @author zehong
  * @date 2023-08-17
  */
-public interface TGasUserInfoMapper 
+public interface TGasUserInfoMapper
 {
     /**
      * 查询燃气用户
-     * 
+     *
      * @param gasUserId 燃气用户ID
      * @return 燃气用户
      */
@@ -21,7 +21,7 @@ public interface TGasUserInfoMapper
 
     /**
      * 查询燃气用户列表
-     * 
+     *
      * @param tGasUserInfo 燃气用户
      * @return 燃气用户集合
      */
@@ -29,7 +29,7 @@ public interface TGasUserInfoMapper
 
     /**
      * 新增燃气用户
-     * 
+     *
      * @param tGasUserInfo 燃气用户
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface TGasUserInfoMapper
 
     /**
      * 修改燃气用户
-     * 
+     *
      * @param tGasUserInfo 燃气用户
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface TGasUserInfoMapper
 
     /**
      * 删除燃气用户
-     * 
+     *
      * @param gasUserId 燃气用户ID
      * @return 结果
      */
@@ -53,9 +53,16 @@ public interface TGasUserInfoMapper
 
     /**
      * 批量删除燃气用户
-     * 
+     *
      * @param gasUserIds 需要删除的数据ID
      * @return 结果
      */
     public int deleteTGasUserInfoByIds(Long[] gasUserIds);
+
+    /**
+     * 查询燃气用户信息
+     * @param tGasUserInfo
+     * @return
+     */
+    List<TGasUserInfo> gasUser(TGasUserInfo tGasUserInfo);
 }

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TPractitionerInfoMapper.java

@@ -5,15 +5,15 @@ import com.zehong.system.domain.TPractitionerInfo;
 
 /**
  * 从业人员信息Mapper接口
- * 
+ *
  * @author zehong
  * @date 2023-08-16
  */
-public interface TPractitionerInfoMapper 
+public interface TPractitionerInfoMapper
 {
     /**
      * 查询从业人员信息
-     * 
+     *
      * @param practitionerId 从业人员信息ID
      * @return 从业人员信息
      */
@@ -21,7 +21,7 @@ public interface TPractitionerInfoMapper
 
     /**
      * 查询从业人员信息列表
-     * 
+     *
      * @param tPractitionerInfo 从业人员信息
      * @return 从业人员信息集合
      */
@@ -29,7 +29,7 @@ public interface TPractitionerInfoMapper
 
     /**
      * 新增从业人员信息
-     * 
+     *
      * @param tPractitionerInfo 从业人员信息
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface TPractitionerInfoMapper
 
     /**
      * 修改从业人员信息
-     * 
+     *
      * @param tPractitionerInfo 从业人员信息
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface TPractitionerInfoMapper
 
     /**
      * 删除从业人员信息
-     * 
+     *
      * @param practitionerId 从业人员信息ID
      * @return 结果
      */
@@ -53,9 +53,16 @@ public interface TPractitionerInfoMapper
 
     /**
      * 批量删除从业人员信息
-     * 
+     *
      * @param practitionerIds 需要删除的数据ID
      * @return 结果
      */
     public int deleteTPractitionerInfoByIds(Long[] practitionerIds);
+
+    /**
+     * 查询登录信息
+     * @param tPractitionerInfo
+     * @return
+     */
+    List<TPractitionerInfo> loginTPractitioner(TPractitionerInfo tPractitionerInfo);
 }

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TVehicleInfoMapper.java

@@ -5,15 +5,15 @@ import com.zehong.system.domain.TVehicleInfo;
 
 /**
  * 燃气车辆信息Mapper接口
- * 
+ *
  * @author zehong
  * @date 2022-03-17
  */
-public interface TVehicleInfoMapper 
+public interface TVehicleInfoMapper
 {
     /**
      * 查询燃气车辆信息
-     * 
+     *
      * @param vehicleId 燃气车辆信息ID
      * @return 燃气车辆信息
      */
@@ -21,7 +21,7 @@ public interface TVehicleInfoMapper
 
     /**
      * 查询燃气车辆信息列表
-     * 
+     *
      * @param tVehicleInfo 燃气车辆信息
      * @return 燃气车辆信息集合
      */
@@ -29,7 +29,7 @@ public interface TVehicleInfoMapper
 
     /**
      * 新增燃气车辆信息
-     * 
+     *
      * @param tVehicleInfo 燃气车辆信息
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface TVehicleInfoMapper
 
     /**
      * 修改燃气车辆信息
-     * 
+     *
      * @param tVehicleInfo 燃气车辆信息
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface TVehicleInfoMapper
 
     /**
      * 删除燃气车辆信息
-     * 
+     *
      * @param vehicleId 燃气车辆信息ID
      * @return 结果
      */
@@ -53,9 +53,16 @@ public interface TVehicleInfoMapper
 
     /**
      * 批量删除燃气车辆信息
-     * 
+     *
      * @param vehicleIds 需要删除的数据ID
      * @return 结果
      */
     public int deleteTVehicleInfoByIds(Long[] vehicleIds);
+
+    /**
+     * 微信小程序  车辆详细信息查询接口
+     * @param tVehicleInfo
+     * @return
+     */
+    TVehicleInfo getTVehicleInfo(TVehicleInfo tVehicleInfo);
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITGasBottleInfoService.java

@@ -7,15 +7,15 @@ import java.util.List;
 
 /**
  * 气瓶信息Service接口
- * 
+ *
  * @author zehong
  * @date 2023-08-15
  */
-public interface ITGasBottleInfoService 
+public interface ITGasBottleInfoService
 {
     /**
      * 查询气瓶信息
-     * 
+     *
      * @param bottleId 气瓶信息ID
      * @return 气瓶信息
      */
@@ -23,7 +23,7 @@ public interface ITGasBottleInfoService
 
     /**
      * 查询气瓶信息列表
-     * 
+     *
      * @param tGasBottleInfo 气瓶信息
      * @return 气瓶信息集合
      */
@@ -31,7 +31,7 @@ public interface ITGasBottleInfoService
 
     /**
      * 新增气瓶信息
-     * 
+     *
      * @param tGasBottleInfo 气瓶信息
      * @return 结果
      */
@@ -39,7 +39,7 @@ public interface ITGasBottleInfoService
 
     /**
      * 修改气瓶信息
-     * 
+     *
      * @param tGasBottleInfo 气瓶信息
      * @return 结果
      */
@@ -47,7 +47,7 @@ public interface ITGasBottleInfoService
 
     /**
      * 批量删除气瓶信息
-     * 
+     *
      * @param bottleIds 需要删除的气瓶信息ID
      * @return 结果
      */
@@ -55,7 +55,7 @@ public interface ITGasBottleInfoService
 
     /**
      * 删除气瓶信息信息
-     * 
+     *
      * @param bottleId 气瓶信息ID
      * @return 结果
      */
@@ -75,4 +75,10 @@ public interface ITGasBottleInfoService
      * @return
      */
     List<BottleStatistics> bottleStatistics(Long stationId);
+
+    /**
+     * 查询气瓶详细信息
+     * @param bottleId
+     */
+    TGasBottleInfo getInf(String bottleId);
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITGasUserInfoService.java

@@ -5,15 +5,15 @@ import com.zehong.system.domain.TGasUserInfo;
 
 /**
  * 燃气用户Service接口
- * 
+ *
  * @author zehong
  * @date 2023-08-17
  */
-public interface ITGasUserInfoService 
+public interface ITGasUserInfoService
 {
     /**
      * 查询燃气用户
-     * 
+     *
      * @param gasUserId 燃气用户ID
      * @return 燃气用户
      */
@@ -21,7 +21,7 @@ public interface ITGasUserInfoService
 
     /**
      * 查询燃气用户列表
-     * 
+     *
      * @param tGasUserInfo 燃气用户
      * @return 燃气用户集合
      */
@@ -29,7 +29,7 @@ public interface ITGasUserInfoService
 
     /**
      * 新增燃气用户
-     * 
+     *
      * @param tGasUserInfo 燃气用户
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface ITGasUserInfoService
 
     /**
      * 修改燃气用户
-     * 
+     *
      * @param tGasUserInfo 燃气用户
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface ITGasUserInfoService
 
     /**
      * 批量删除燃气用户
-     * 
+     *
      * @param gasUserIds 需要删除的燃气用户ID
      * @return 结果
      */
@@ -53,7 +53,7 @@ public interface ITGasUserInfoService
 
     /**
      * 删除燃气用户信息
-     * 
+     *
      * @param gasUserId 燃气用户ID
      * @return 结果
      */
@@ -66,4 +66,10 @@ public interface ITGasUserInfoService
      * @return
      */
     String importTGasUserInfo(List<TGasUserInfo> tGasUserInfoList, boolean isUpdateSupport);
+
+    /**
+     * 查询燃气用户信息
+     * @param tGasUserInfo
+     */
+    List<TGasUserInfo> gasUser(TGasUserInfo tGasUserInfo);
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITPractitionerInfoService.java

@@ -7,15 +7,15 @@ import com.zehong.system.domain.TPractitionerInfo;
 
 /**
  * 从业人员信息Service接口
- * 
+ *
  * @author zehong
  * @date 2023-08-16
  */
-public interface ITPractitionerInfoService 
+public interface ITPractitionerInfoService
 {
     /**
      * 查询从业人员信息
-     * 
+     *
      * @param practitionerId 从业人员信息ID
      * @return 从业人员信息
      */
@@ -23,7 +23,7 @@ public interface ITPractitionerInfoService
 
     /**
      * 查询从业人员信息列表
-     * 
+     *
      * @param tPractitionerInfo 从业人员信息
      * @return 从业人员信息集合
      */
@@ -31,7 +31,7 @@ public interface ITPractitionerInfoService
 
     /**
      * 新增从业人员信息
-     * 
+     *
      * @param tPractitionerInfo 从业人员信息
      * @return 结果
      */
@@ -39,7 +39,7 @@ public interface ITPractitionerInfoService
 
     /**
      * 修改从业人员信息
-     * 
+     *
      * @param tPractitionerInfo 从业人员信息
      * @return 结果
      */
@@ -47,7 +47,7 @@ public interface ITPractitionerInfoService
 
     /**
      * 批量删除从业人员信息
-     * 
+     *
      * @param practitionerIds 需要删除的从业人员信息ID
      * @return 结果
      */
@@ -55,7 +55,7 @@ public interface ITPractitionerInfoService
 
     /**
      * 删除从业人员信息信息
-     * 
+     *
      * @param practitionerId 从业人员信息ID
      * @return 结果
      */
@@ -68,4 +68,11 @@ public interface ITPractitionerInfoService
      * @return
      */
     String importTPractitionerInfo(List<TPractitionerInfo> tPractitionerInfoList, Boolean isUpdateSupport);
+
+    /**
+     * 查询登录信息
+     * @param tPractitionerInfo
+     * @return
+     */
+    List<TPractitionerInfo> loginTPractitioner(TPractitionerInfo tPractitionerInfo);
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITVehicleInfoService.java

@@ -5,15 +5,15 @@ import com.zehong.system.domain.TVehicleInfo;
 
 /**
  * 燃气车辆信息Service接口
- * 
+ *
  * @author zehong
  * @date 2022-03-17
  */
-public interface ITVehicleInfoService 
+public interface ITVehicleInfoService
 {
     /**
      * 查询燃气车辆信息
-     * 
+     *
      * @param vehicleId 燃气车辆信息ID
      * @return 燃气车辆信息
      */
@@ -21,7 +21,7 @@ public interface ITVehicleInfoService
 
     /**
      * 查询燃气车辆信息列表
-     * 
+     *
      * @param tVehicleInfo 燃气车辆信息
      * @return 燃气车辆信息集合
      */
@@ -29,7 +29,7 @@ public interface ITVehicleInfoService
 
     /**
      * 新增燃气车辆信息
-     * 
+     *
      * @param tVehicleInfo 燃气车辆信息
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface ITVehicleInfoService
 
     /**
      * 修改燃气车辆信息
-     * 
+     *
      * @param tVehicleInfo 燃气车辆信息
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface ITVehicleInfoService
 
     /**
      * 批量删除燃气车辆信息
-     * 
+     *
      * @param vehicleIds 需要删除的燃气车辆信息ID
      * @return 结果
      */
@@ -53,9 +53,16 @@ public interface ITVehicleInfoService
 
     /**
      * 删除燃气车辆信息信息
-     * 
+     *
      * @param vehicleId 燃气车辆信息ID
      * @return 结果
      */
     public int deleteTVehicleInfoById(Long vehicleId);
+
+    /**
+     * 微信小程序  车辆详细信息查询接口
+     * @param tVehicleInfo
+     * @return
+     */
+    TVehicleInfo getTVehicleInfo(TVehicleInfo tVehicleInfo);
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TGasBottleInfoServiceImpl.java

@@ -20,12 +20,12 @@ import java.util.List;
 
 /**
  * 气瓶信息Service业务层处理
- * 
+ *
  * @author zehong
  * @date 2023-08-15
  */
 @Service
-public class TGasBottleInfoServiceImpl implements ITGasBottleInfoService 
+public class TGasBottleInfoServiceImpl implements ITGasBottleInfoService
 {
     private static final Logger log = LoggerFactory.getLogger(TGasBottleInfoServiceImpl.class);
 
@@ -37,7 +37,7 @@ public class TGasBottleInfoServiceImpl implements ITGasBottleInfoService
 
     /**
      * 查询气瓶信息
-     * 
+     *
      * @param bottleId 气瓶信息ID
      * @return 气瓶信息
      */
@@ -49,7 +49,7 @@ public class TGasBottleInfoServiceImpl implements ITGasBottleInfoService
 
     /**
      * 查询气瓶信息列表
-     * 
+     *
      * @param tGasBottleInfo 气瓶信息
      * @return 气瓶信息
      */
@@ -61,7 +61,7 @@ public class TGasBottleInfoServiceImpl implements ITGasBottleInfoService
 
     /**
      * 新增气瓶信息
-     * 
+     *
      * @param tGasBottleInfo 气瓶信息
      * @return 结果
      */
@@ -74,7 +74,7 @@ public class TGasBottleInfoServiceImpl implements ITGasBottleInfoService
 
     /**
      * 修改气瓶信息
-     * 
+     *
      * @param tGasBottleInfo 气瓶信息
      * @return 结果
      */
@@ -87,7 +87,7 @@ public class TGasBottleInfoServiceImpl implements ITGasBottleInfoService
 
     /**
      * 批量删除气瓶信息
-     * 
+     *
      * @param bottleIds 需要删除的气瓶信息ID
      * @return 结果
      */
@@ -99,7 +99,7 @@ public class TGasBottleInfoServiceImpl implements ITGasBottleInfoService
 
     /**
      * 删除气瓶信息信息
-     * 
+     *
      * @param bottleId 气瓶信息ID
      * @return 结果
      */
@@ -185,4 +185,14 @@ public class TGasBottleInfoServiceImpl implements ITGasBottleInfoService
     public List<BottleStatistics> bottleStatistics(Long stationId){
         return tGasBottleInfoMapper.bottleStatistics(stationId);
     }
+
+    /**
+     * 查询气瓶详细信息
+     * @param bottleId
+     * @return
+     */
+    @Override
+    public TGasBottleInfo getInf(String bottleId) {
+        return tGasBottleInfoMapper.getInf(bottleId);
+    }
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TGasUserInfoServiceImpl.java

@@ -19,12 +19,12 @@ import org.springframework.util.CollectionUtils;
 
 /**
  * 燃气用户Service业务层处理
- * 
+ *
  * @author zehong
  * @date 2023-08-17
  */
 @Service
-public class TGasUserInfoServiceImpl implements ITGasUserInfoService 
+public class TGasUserInfoServiceImpl implements ITGasUserInfoService
 {
     private static final Logger log = LoggerFactory.getLogger(TGasUserInfoServiceImpl.class);
 
@@ -33,7 +33,7 @@ public class TGasUserInfoServiceImpl implements ITGasUserInfoService
 
     /**
      * 查询燃气用户
-     * 
+     *
      * @param gasUserId 燃气用户ID
      * @return 燃气用户
      */
@@ -45,7 +45,7 @@ public class TGasUserInfoServiceImpl implements ITGasUserInfoService
 
     /**
      * 查询燃气用户列表
-     * 
+     *
      * @param tGasUserInfo 燃气用户
      * @return 燃气用户
      */
@@ -57,7 +57,7 @@ public class TGasUserInfoServiceImpl implements ITGasUserInfoService
 
     /**
      * 新增燃气用户
-     * 
+     *
      * @param tGasUserInfo 燃气用户
      * @return 结果
      */
@@ -70,7 +70,7 @@ public class TGasUserInfoServiceImpl implements ITGasUserInfoService
 
     /**
      * 修改燃气用户
-     * 
+     *
      * @param tGasUserInfo 燃气用户
      * @return 结果
      */
@@ -83,7 +83,7 @@ public class TGasUserInfoServiceImpl implements ITGasUserInfoService
 
     /**
      * 批量删除燃气用户
-     * 
+     *
      * @param gasUserIds 需要删除的燃气用户ID
      * @return 结果
      */
@@ -95,7 +95,7 @@ public class TGasUserInfoServiceImpl implements ITGasUserInfoService
 
     /**
      * 删除燃气用户信息
-     * 
+     *
      * @param gasUserId 燃气用户ID
      * @return 结果
      */
@@ -158,4 +158,14 @@ public class TGasUserInfoServiceImpl implements ITGasUserInfoService
         }
         return successMsg.toString();
     }
+
+    /**
+     * 查询燃气用户信息
+     * @param tGasUserInfo
+     * @return
+     */
+    @Override
+    public List<TGasUserInfo> gasUser(TGasUserInfo tGasUserInfo) {
+        return tGasUserInfoMapper.gasUser(tGasUserInfo);
+    }
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TPractitionerInfoServiceImpl.java

@@ -21,12 +21,12 @@ import java.util.List;
 
 /**
  * 从业人员信息Service业务层处理
- * 
+ *
  * @author zehong
  * @date 2023-08-16
  */
 @Service
-public class TPractitionerInfoServiceImpl implements ITPractitionerInfoService 
+public class TPractitionerInfoServiceImpl implements ITPractitionerInfoService
 {
 
     private static final Logger log = LoggerFactory.getLogger(TPractitionerInfoServiceImpl.class);
@@ -42,7 +42,7 @@ public class TPractitionerInfoServiceImpl implements ITPractitionerInfoService
 
     /**
      * 查询从业人员信息
-     * 
+     *
      * @param practitionerId 从业人员信息ID
      * @return 从业人员信息
      */
@@ -54,7 +54,7 @@ public class TPractitionerInfoServiceImpl implements ITPractitionerInfoService
 
     /**
      * 查询从业人员信息列表
-     * 
+     *
      * @param tPractitionerInfo 从业人员信息
      * @return 从业人员信息
      */
@@ -66,7 +66,7 @@ public class TPractitionerInfoServiceImpl implements ITPractitionerInfoService
 
     /**
      * 新增从业人员信息
-     * 
+     *
      * @param tPractitionerInfo 从业人员信息
      * @return 结果
      */
@@ -79,7 +79,7 @@ public class TPractitionerInfoServiceImpl implements ITPractitionerInfoService
 
     /**
      * 修改从业人员信息
-     * 
+     *
      * @param tPractitionerInfo 从业人员信息
      * @return 结果
      */
@@ -92,7 +92,7 @@ public class TPractitionerInfoServiceImpl implements ITPractitionerInfoService
 
     /**
      * 批量删除从业人员信息
-     * 
+     *
      * @param practitionerIds 需要删除的从业人员信息ID
      * @return 结果
      */
@@ -104,7 +104,7 @@ public class TPractitionerInfoServiceImpl implements ITPractitionerInfoService
 
     /**
      * 删除从业人员信息信息
-     * 
+     *
      * @param practitionerId 从业人员信息ID
      * @return 结果
      */
@@ -193,4 +193,14 @@ public class TPractitionerInfoServiceImpl implements ITPractitionerInfoService
         }
         return successMsg.toString();
     }
+
+    /**
+     * 查询登录信息
+     * @param tPractitionerInfo
+     * @return
+     */
+    @Override
+    public List<TPractitionerInfo> loginTPractitioner(TPractitionerInfo tPractitionerInfo) {
+        return tPractitionerInfoMapper.loginTPractitioner(tPractitionerInfo);
+    }
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TVehicleInfoServiceImpl.java

@@ -9,19 +9,19 @@ import com.zehong.system.service.ITVehicleInfoService;
 
 /**
  * 燃气车辆信息Service业务层处理
- * 
+ *
  * @author zehong
  * @date 2022-03-17
  */
 @Service
-public class TVehicleInfoServiceImpl implements ITVehicleInfoService 
+public class TVehicleInfoServiceImpl implements ITVehicleInfoService
 {
     @Autowired
     private TVehicleInfoMapper tVehicleInfoMapper;
 
     /**
      * 查询燃气车辆信息
-     * 
+     *
      * @param vehicleId 燃气车辆信息ID
      * @return 燃气车辆信息
      */
@@ -33,7 +33,7 @@ public class TVehicleInfoServiceImpl implements ITVehicleInfoService
 
     /**
      * 查询燃气车辆信息列表
-     * 
+     *
      * @param tVehicleInfo 燃气车辆信息
      * @return 燃气车辆信息
      */
@@ -45,7 +45,7 @@ public class TVehicleInfoServiceImpl implements ITVehicleInfoService
 
     /**
      * 新增燃气车辆信息
-     * 
+     *
      * @param tVehicleInfo 燃气车辆信息
      * @return 结果
      */
@@ -57,7 +57,7 @@ public class TVehicleInfoServiceImpl implements ITVehicleInfoService
 
     /**
      * 修改燃气车辆信息
-     * 
+     *
      * @param tVehicleInfo 燃气车辆信息
      * @return 结果
      */
@@ -69,7 +69,7 @@ public class TVehicleInfoServiceImpl implements ITVehicleInfoService
 
     /**
      * 批量删除燃气车辆信息
-     * 
+     *
      * @param vehicleIds 需要删除的燃气车辆信息ID
      * @return 结果
      */
@@ -81,7 +81,7 @@ public class TVehicleInfoServiceImpl implements ITVehicleInfoService
 
     /**
      * 删除燃气车辆信息信息
-     * 
+     *
      * @param vehicleId 燃气车辆信息ID
      * @return 结果
      */
@@ -90,4 +90,14 @@ public class TVehicleInfoServiceImpl implements ITVehicleInfoService
     {
         return tVehicleInfoMapper.deleteTVehicleInfoById(vehicleId);
     }
+
+    /**
+     * 微信小程序  车辆详细信息查询接口
+     * @param tVehicleInfo
+     * @return
+     */
+    @Override
+    public TVehicleInfo getTVehicleInfo(TVehicleInfo tVehicleInfo) {
+        return tVehicleInfoMapper.getTVehicleInfo(tVehicleInfo);
+    }
 }

gassafetyprogress-system/src/main/resources/mapper/system/TAirChargeRecordMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zehong.system.mapper.TAirChargeRecordMapper">
-    
+
     <resultMap type="TAirChargeRecord" id="TAirChargeRecordResult">
         <result property="chargeRecordId"    column="charge_record_id"    />
         <result property="stationId"    column="station_id"    />
@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTAirChargeRecordList" parameterType="TAirChargeRecord" resultMap="TAirChargeRecordResult">
         <include refid="selectTAirChargeRecordVo"/>
-        <where>  
+        <where>
             <if test="stationId != null "> and charge.station_id = #{stationId}</if>
             <if test="bottleId != null "> and charge.bottle_id = #{bottleId}</if>
             <if test="chargeOperator != null "> and charge.charge_operator = #{chargeOperator}</if>
@@ -57,14 +57,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDel != null  and isDel != ''"> and charge.is_del = #{isDel}</if>
             <if test="chargeBeginTime != null and chargeEndTime != null">and charge.charge_date BETWEEN #{chargeBeginTime} and #{chargeEndTime}</if>
             <if test="bottleCode != null">and bottle.bottle_code like concat('%', #{bottleCode}, '%')</if>
+            <if test="stationName != null">and station.station_name like concat('%', #{stationName}, '%')</if>
         </where>
     </select>
-    
+
     <select id="selectTAirChargeRecordById" parameterType="Long" resultMap="TAirChargeRecordResult">
         <include refid="selectTAirChargeRecordVo"/>
         where charge.charge_record_id = #{chargeRecordId}
     </select>
-        
+
     <insert id="insertTAirChargeRecord" parameterType="TAirChargeRecord" useGeneratedKeys="true" keyProperty="chargeRecordId">
         insert into t_air_charge_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -112,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTAirChargeRecordByIds" parameterType="String">
-        delete from t_air_charge_record where charge_record_id in 
+        delete from t_air_charge_record where charge_record_id in
         <foreach item="chargeRecordId" collection="array" open="(" separator="," close=")">
             #{chargeRecordId}
         </foreach>
@@ -167,4 +168,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         group by air.station_id,air.charge_operator
     </select>
-</mapper>
+</mapper>
\ No newline at end of file

gassafetyprogress-system/src/main/resources/mapper/system/TGasBottleInfoMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zehong.system.mapper.TGasBottleInfoMapper">
-    
+
     <resultMap type="TGasBottleInfo" id="TGasBottleInfoResult">
         <result property="bottleId"    column="bottle_id"    />
         <result property="stationId"    column="station_id"    />
@@ -39,75 +39,75 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectTGasBottleInfoVo">
 
         SELECT
-            bottle.bottle_id,
-            bottle.station_id,
-            bottle.bottle_code,
-            bottle.myself_num,
-            bottle.produce_unit,
-            bottle.produce_date,
-            bottle.produce_code,
-            bottle.bottle_status,
-            bottle.last_charge_date,
-            bottle.longitude,
-            bottle.latitude,
-            bottle.charge_medium,
+            bottle_id,
+            station_id,
+            bottle_code,
+            myself_num,
+            produce_unit,
+            produce_date,
+            produce_code,
+            bottle_status,
+            last_charge_date,
+            longitude,
+            latitude,
+            charge_medium,
             bottle_specs,
-            bottle.rated_presure,
-            bottle.bottle_capacity,
-            bottle.wall_thickness,
-            bottle.tare,
-            bottle.use_register_code,
-            bottle.register_date,
-            bottle.last_check_date,
-            bottle.next_check_date,
+            rated_presure,
+            bottle_capacity,
+            wall_thickness,
+            tare,
+            use_register_code,
+            register_date,
+            last_check_date,
+            next_check_date,
             scrap_date,
             current_status,
-            bottle.empty_type,
-            bottle.create_time,
-            bottle.update_time,
-            bottle.is_del,
-            bottle.remark,
-           (SELECT station_name FROM t_gas_storage_station_info info WHERE info.station_id = bottle.station_id) as station_name
+            empty_type,
+            create_time,
+            update_time,
+            is_del,
+            remark,
+           (SELECT station_name FROM t_gas_storage_station_info info WHERE info.station_id = station_id) as station_name
         FROM
-            t_gas_bottle_info bottle
+            t_gas_bottle_info
     </sql>
 
     <select id="selectTGasBottleInfoList" parameterType="TGasBottleInfo" resultMap="TGasBottleInfoResult">
         <include refid="selectTGasBottleInfoVo"/>
-        <where>  
-            <if test="stationId != null "> and bottle.station_id = #{stationId}</if>
-            <if test="bottleCode != null  and bottleCode != ''"> and bottle.bottle_code = #{bottleCode}</if>
-            <if test="myselfNum != null  and myselfNum != ''"> and bottle.myself_num = #{myselfNum}</if>
-            <if test="produceUnit != null  and produceUnit != ''"> and bottle.produce_unit = #{produceUnit}</if>
-            <if test="produceDate != null "> and bottle.produce_date = #{produceDate}</if>
-            <if test="produceBeginTime != null and produceEndTime">and bottle.produce_date between #{produceBeginTime} and #{produceEndTime}</if>
-            <if test="produceCode != null  and produceCode != ''"> and bottle.produce_code = #{produceCode}</if>
-            <if test="bottleStatus != null  and bottleStatus != ''"> and bottle.bottle_status = #{bottleStatus}</if>
-            <if test="lastChargeDate != null "> and bottle.last_charge_date = #{lastChargeDate}</if>
-            <if test="longitude != null "> and bottle.longitude = #{longitude}</if>
-            <if test="latitude != null "> and bottle.latitude = #{latitude}</if>
-            <if test="chargeMedium != null  and chargeMedium != ''"> and bottle.charge_medium = #{chargeMedium}</if>
-            <if test="bottleSpecs != null  and bottleSpecs != ''"> and bottle.bottle_specs = #{bottleSpecs}</if>
-            <if test="ratedPresure != null  and ratedPresure != ''"> and bottle.rated_presure = #{ratedPresure}</if>
-            <if test="bottleCapacity != null  and bottleCapacity != ''"> and bottle.bottle_capacity = #{bottleCapacity}</if>
-            <if test="wallThickness != null  and wallThickness != ''"> and bottle.wall_thickness = #{wallThickness}</if>
-            <if test="tare != null  and tare != ''"> and bottle.tare = #{tare}</if>
-            <if test="useRegisterCode != null  and useRegisterCode != ''"> and bottle.use_register_code = #{useRegisterCode}</if>
-            <if test="registerDate != null "> and bottle.register_date = #{registerDate}</if>
-            <if test="lastCheckDate != null "> and bottle.last_check_date = #{lastCheckDate}</if>
-            <if test="nextCheckDate != null "> and bottle.next_check_date = #{nextCheckDate}</if>
-            <if test="scrapDate != null "> and bottle.scrap_date = #{scrapDate}</if>
-            <if test="currentStatus != null  and currentStatus != ''"> and bottle.current_status = #{currentStatus}</if>
-            <if test="emptyType != null  and emptyType != ''"> and bottle.empty_type = #{emptyType}</if>
-            <if test="isDel != null  and isDel != ''"> and bottle.is_del = #{isDel}</if>
+        <where>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="bottleCode != null  and bottleCode != ''"> and bottle_code = #{bottleCode}</if>
+            <if test="myselfNum != null  and myselfNum != ''"> and myself_num = #{myselfNum}</if>
+            <if test="produceUnit != null  and produceUnit != ''"> and produce_unit = #{produceUnit}</if>
+            <if test="produceDate != null "> and produce_date = #{produceDate}</if>
+            <if test="produceBeginTime != null and produceEndTime">and produce_date between #{produceBeginTime} and #{produceEndTime}</if>
+            <if test="produceCode != null  and produceCode != ''"> and produce_code = #{produceCode}</if>
+            <if test="bottleStatus != null  and bottleStatus != ''"> and bottle_status = #{bottleStatus}</if>
+            <if test="lastChargeDate != null "> and last_charge_date = #{lastChargeDate}</if>
+            <if test="longitude != null "> and longitude = #{longitude}</if>
+            <if test="latitude != null "> and latitude = #{latitude}</if>
+            <if test="chargeMedium != null  and chargeMedium != ''"> and charge_medium = #{chargeMedium}</if>
+            <if test="bottleSpecs != null  and bottleSpecs != ''"> and bottle_specs = #{bottleSpecs}</if>
+            <if test="ratedPresure != null  and ratedPresure != ''"> and rated_presure = #{ratedPresure}</if>
+            <if test="bottleCapacity != null  and bottleCapacity != ''"> and bottle_capacity = #{bottleCapacity}</if>
+            <if test="wallThickness != null  and wallThickness != ''"> and wall_thickness = #{wallThickness}</if>
+            <if test="tare != null  and tare != ''"> and tare = #{tare}</if>
+            <if test="useRegisterCode != null  and useRegisterCode != ''"> and use_register_code = #{useRegisterCode}</if>
+            <if test="registerDate != null "> and register_date = #{registerDate}</if>
+            <if test="lastCheckDate != null "> and last_check_date = #{lastCheckDate}</if>
+            <if test="nextCheckDate != null "> and next_check_date = #{nextCheckDate}</if>
+            <if test="scrapDate != null "> and scrap_date = #{scrapDate}</if>
+            <if test="currentStatus != null  and currentStatus != ''"> and current_status = #{currentStatus}</if>
+            <if test="emptyType != null  and emptyType != ''"> and empty_type = #{emptyType}</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
         </where>
     </select>
-    
+
     <select id="selectTGasBottleInfoById" parameterType="Long" resultMap="TGasBottleInfoResult">
         <include refid="selectTGasBottleInfoVo"/>
-        where bottle.bottle_id = #{bottleId}
+        where bottle_id = #{bottleId}
     </select>
-        
+
     <insert id="insertTGasBottleInfo" parameterType="TGasBottleInfo" useGeneratedKeys="true" keyProperty="bottleId">
         insert into t_gas_bottle_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -209,7 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTGasBottleInfoByIds" parameterType="String">
-        delete from t_gas_bottle_info where bottle_id in 
+        delete from t_gas_bottle_info where bottle_id in
         <foreach item="bottleId" collection="array" open="(" separator="," close=")">
             #{bottleId}
         </foreach>
@@ -241,4 +241,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         )final
         group by final.station_id
     </select>
-</mapper>
+
\ No newline at end of file
+    <!--查询气瓶详细信息-->
+    <select id="getInf" resultMap="TGasBottleInfoResult"  parameterType="java.lang.String">
+        <include refid="selectTGasBottleInfoVo"/>
+        where bottle_code = #{bottleId}
+    </select>
+</mapper>

gassafetyprogress-system/src/main/resources/mapper/system/TGasUserInfoMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zehong.system.mapper.TGasUserInfoMapper">
-    
+
     <resultMap type="TGasUserInfo" id="TGasUserInfoResult">
         <result property="gasUserId"    column="gas_user_id"    />
         <result property="gasUserName"    column="gas_user_name"    />
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTGasUserInfoList" parameterType="TGasUserInfo" resultMap="TGasUserInfoResult">
         <include refid="selectTGasUserInfoVo"/>
-        <where>  
+        <where>
             <if test="gasUserName != null  and gasUserName != ''"> and gas_user_name like concat('%', #{gasUserName}, '%')</if>
             <if test="gasUserCode != null  and gasUserCode != ''"> and gas_user_code = #{gasUserCode}</if>
             <if test="gasUserType != null  and gasUserType != ''"> and gas_user_type = #{gasUserType}</if>
@@ -40,12 +40,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
         </where>
     </select>
-    
+
     <select id="selectTGasUserInfoById" parameterType="Long" resultMap="TGasUserInfoResult">
         <include refid="selectTGasUserInfoVo"/>
         where gas_user_id = #{gasUserId}
     </select>
-        
+
     <insert id="insertTGasUserInfo" parameterType="TGasUserInfo" useGeneratedKeys="true" keyProperty="gasUserId">
         insert into t_gas_user_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -105,9 +105,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTGasUserInfoByIds" parameterType="String">
-        delete from t_gas_user_info where gas_user_id in 
+        delete from t_gas_user_info where gas_user_id in
         <foreach item="gasUserId" collection="array" open="(" separator="," close=")">
             #{gasUserId}
         </foreach>
     </delete>
-</mapper>
+
\ No newline at end of file
+    <!--查询燃气用户信息-->
+    <select id="gasUser" parameterType="TGasUserInfo" resultMap="TGasUserInfoResult">
+        <include refid="selectTGasUserInfoVo"/>
+        where gas_user_name like concat('%', #{gasUserName}, '%')
+    </select>
+</mapper>

gassafetyprogress-system/src/main/resources/mapper/system/TPractitionerInfoMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zehong.system.mapper.TPractitionerInfoMapper">
-    
+
     <resultMap type="TPractitionerInfo" id="TPractitionerInfoResult">
         <result property="practitionerId"    column="practitioner_id"    />
         <result property="stationId"    column="station_id"    />
@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPractitionerInfoList" parameterType="TPractitionerInfo" resultMap="TPractitionerInfoResult">
         <include refid="selectTPractitionerInfoVo"/>
-        <where>  
+        <where>
             <if test="stationId != null "> and info.station_id = #{stationId}</if>
             <if test="practitionerNum != null  and practitionerNum != ''"> and info.practitioner_num = #{practitionerNum}</if>
             <if test="name != null  and name != ''"> and info.name like concat('%', #{name}, '%')</if>
@@ -72,12 +72,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDel != null  and isDel != ''"> and info.is_del = #{isDel}</if>
         </where>
     </select>
-    
+
     <select id="selectTPractitionerInfoById" parameterType="Long" resultMap="TPractitionerInfoResult">
         <include refid="selectTPractitionerInfoVo"/>
         where info.practitioner_id = #{practitionerId}
     </select>
-        
+
+    <!--查询登录信息-->
+    <select id="loginTPractitioner" resultMap="TPractitionerInfoResult">
+        <include refid="selectTPractitionerInfoVo"/>
+        where info.tel_num = #{telNum} and is_del='0'
+    </select>
+
     <insert id="insertTPractitionerInfo" parameterType="TPractitionerInfo" useGeneratedKeys="true" keyProperty="practitionerId">
         insert into t_practitioner_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -149,9 +155,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTPractitionerInfoByIds" parameterType="String">
-        delete from t_practitioner_info where practitioner_id in 
+        delete from t_practitioner_info where practitioner_id in
         <foreach item="practitionerId" collection="array" open="(" separator="," close=")">
             #{practitionerId}
         </foreach>
     </delete>
-</mapper>
+</mapper>
\ No newline at end of file

gassafetyprogress-system/src/main/resources/mapper/system/TVehicleInfoMapper.xml

@@ -20,10 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="beyondEnterpriseName"    column="enterprise_name"    />
         <result property="siteStationName"    column="site_station_name"    />
+        <result property="carNumber"    column="car_number"    />
     </resultMap>
 
     <sql id="selectTVehicleInfoVo">
-        select vehicle_id, car_num, brand_model, vehicle_type, vehicle_load, vehicle_size, vehicle_limt, vehicle_inspect, beyond_enterprise_id, person_liable, phone, is_del, remarks from t_vehicle_info
+        select vehicle_id, car_number,car_num, brand_model, vehicle_type, vehicle_load, vehicle_size, vehicle_limt, vehicle_inspect, beyond_enterprise_id, person_liable, phone, is_del, remarks from t_vehicle_info
     </sql>
 
     <select id="selectTVehicleInfoList" parameterType="TVehicleInfo" resultMap="TVehicleInfoResult">
@@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTVehicleInfo" parameterType="TVehicleInfo" useGeneratedKeys="true" keyProperty="vehicleId">
         insert into t_vehicle_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="carNumber != null">car_number,</if>
             <if test="carNum != null">car_num,</if>
             <if test="brandModel != null">brand_model,</if>
             <if test="vehicleType != null">vehicle_type,</if>
@@ -71,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">remarks,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="carNumber != null">#{carNumber},</if>
             <if test="carNum != null">#{carNum},</if>
             <if test="brandModel != null">#{brandModel},</if>
             <if test="vehicleType != null">#{vehicleType},</if>
@@ -89,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTVehicleInfo" parameterType="TVehicleInfo">
         update t_vehicle_info
         <trim prefix="SET" suffixOverrides=",">
+            <if test="carNumber != null">car_number = #{carNumber},</if>
             <if test="carNum != null">car_num = #{carNum},</if>
             <if test="brandModel != null">brand_model = #{brandModel},</if>
             <if test="vehicleType != null">vehicle_type = #{vehicleType},</if>
@@ -115,4 +119,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{vehicleId}
         </foreach>
     </delete>
+
+    <!--微信小程序  车辆详细信息查询接口-->
+    <select id="getTVehicleInfo" resultMap="TVehicleInfoResult">
+       select a.*,b.enterprise_name
+        from t_vehicle_info a left join t_enterprise_info b on a.beyond_enterprise_id=b.enterprise_id
+        where a.car_number = #{carNumber}
+    </select>
 </mapper>