微信巡检人员openid绑定

src/main/java/org/rcisoft/business/device/assets/controller/BusDeviceController.java

@@ -113,21 +113,19 @@ public class BusDeviceController extends PaginationController<BusDevice> {
                 busDeviceServiceImpl.getDevicesBySysId(sysId, proId));
     }
 
-    @ApiOperation(value = "通过项目id与子系统id导出子系统的设备清单excel文件")
+    @ApiOperation(value = "通过项目id设备清单excel文件")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "sysId", value = "sysId", required = true,paramType = "path", dataType = "varchar"),
             @ApiImplicitParam(name = "proId", value = "proId", required = true,paramType = "path", dataType = "varvhar")
     })
     @ResponseBody
-    @RequestMapping(value = "/exportExcel/{proId}/{sysId}",method = RequestMethod.GET)
-    public void exportExcel(HttpServletResponse response,@PathVariable("sysId") String sysId,
+    @RequestMapping(value = "/exportExcel/{proId}",method = RequestMethod.GET)
+    public void exportExcel(HttpServletResponse response,
                             @PathVariable("proId") String proId) throws UnsupportedEncodingException {
-        System.out.println("参数："+sysId+"  "+proId);
         List<DeviceAssetStatisticVo> deviceList = new ArrayList<>();
         //先获取数据库数据
-        deviceList = busDeviceServiceImpl.getDevicesBySysId(sysId, proId);
-        //通过项目id与系统id获取对应的名称组拼成文件名
-        String filename = busDeviceServiceImpl.getProNameByProId(proId) + busDeviceServiceImpl.getSysNameBySysId(sysId)+"设备统计报表.xls";
+        deviceList = busDeviceServiceImpl.getDevicesBySysId(null, proId);
+        //通过项目id获取对应的名称组拼成文件名
+        String filename = busDeviceServiceImpl.getProNameByProId(proId) +"设备统计报表.xls";
 
         //创建excel生成对象
         HSSFWorkbook workbook = new HSSFWorkbook();

src/main/java/org/rcisoft/business/system/user/controller/LoginController.java

@@ -77,6 +77,11 @@ public class LoginController extends PaginationController<SysUser> {
     public Result loginWechat(@RequestBody SysUser user){
         return Result.builder(userService.loginWechat(user));
     }
+    @RequestMapping(value = "/openIdBindingFlag")
+    @ResponseBody
+    public Object openIdBindingFlag(@RequestParam String openId){
+        return userService.getUserByOpenId(openId);
+    }
 
 
 

src/main/java/org/rcisoft/business/system/user/dao/UserRepository.java

@@ -28,6 +28,14 @@ public interface UserRepository extends BaseMapper<SysUser>{
      */
     List<Map<String,Object>> getUserInfo(@Param("userId") String userId);
 
+    /**
+     * 根据openid查找用户信息，查看是否绑定
+     * @param openId
+     * @return
+     */
+    @Select("<script>select * from sys_user where openid = #{openId}</script>")
+    List<Map<String,Object>> getUserByOpenId(@Param("openId") String openId);
+
 
     /**
      * 查询所有用户

src/main/java/org/rcisoft/business/system/user/service/UserService.java

 package org.rcisoft.business.system.user.service;
 
+import org.apache.ibatis.annotations.Param;
 import org.rcisoft.business.system.user.entity.*;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
@@ -106,5 +107,7 @@ public interface UserService {
 
      PersistModel loginWechat(SysUser user);
 
+     boolean getUserByOpenId(@Param("openId") String openId);
+
 
 }

src/main/java/org/rcisoft/business/system/user/service/impl/UserServiceImpl.java

@@ -374,6 +374,15 @@ public class UserServiceImpl implements UserService {
         return new PersistModel(line,message);
     }
 
+    @Override
+    public boolean getUserByOpenId(String openId) {
+        List<Map<String,Object>> list = userRepository.getUserByOpenId(openId);
+        if(list!=null && list.size()>0){
+            return true;
+        }
+        return false;
+    }
+
     public List<Map<String, Object>> handleMenu(List<Map<String, Object>> menuList){
         List<Map<String, Object>> result = new ArrayList<>();
         for(Map<String, Object> tmap : menuList){

src/main/resources/mapper/sys/device/assets/deviceMapper.xml

@@ -2,20 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.rcisoft.business.device.assets.dao.BusDeviceRepository">
     <resultMap id="BaseResultMap" type="org.rcisoft.business.device.assets.entity.BusDevice">
-            <id column="DEV_ID" jdbcType="VARCHAR" property="devId"/>
-            <result column="DEV_NM" jdbcType="VARCHAR" property="devNm"/>
-            <result column="DEV_TP_ID" jdbcType="VARCHAR" property="devTpId"/>
-            <result column="DEV_NUM" jdbcType="VARCHAR" property="devNum"/>
-            <result column="DEV_LOCAL" jdbcType="VARCHAR" property="devLocal"/>
-            <result column="MODEL" jdbcType="VARCHAR" property="model"/>
-            <result column="FAC_ID" jdbcType="VARCHAR" property="facId"/>
-            <result column="PARAM" jdbcType="VARCHAR" property="param"/>
-            <result column="INSTALL_DATE" jdbcType="TIMESTAMP" property="installDate"/>
-            <result column="PRO_ID" jdbcType="VARCHAR" property="proId"/>
-            <result column="SYS_ID" jdbcType="VARCHAR" property="sysId"/>
-            <result column="OWN_ID" jdbcType="VARCHAR" property="ownId"/>
-        <result column="SHUT_POWER" jdbcType="DECIMAL" property="shutPower"/>
-        <result column="RUN_TM" jdbcType="DECIMAL" property="runTm"/>
+        <id column="DEV_ID" jdbcType="VARCHAR" property="devId"/>
+        <result column="DEV_NM" jdbcType="VARCHAR" property="devNm"/>
+        <result column="DEV_TP_ID" jdbcType="VARCHAR" property="devTpId"/>
+        <result column="DEV_NUM" jdbcType="VARCHAR" property="devNum"/>
+        <result column="DEV_LOCAL" jdbcType="VARCHAR" property="devLocal"/>
+        <result column="MODEL" jdbcType="VARCHAR" property="model"/>
+        <result column="FAC_ID" jdbcType="VARCHAR" property="facId"/>
+        <result column="PARAM" jdbcType="VARCHAR" property="param"/>
+        <result column="INSTALL_DATE" jdbcType="TIMESTAMP" property="installDate"/>
+        <result column="PRO_ID" jdbcType="VARCHAR" property="proId"/>
+        <result column="SYS_ID" jdbcType="VARCHAR" property="sysId"/>
+        <result column="OWN_ID" jdbcType="VARCHAR" property="ownId"/>
     </resultMap>
     <resultMap id="DeviceAssetStatistics" type="org.rcisoft.business.device.assets.vo.DeviceAssetStatisticVo">
         <result column="DEV_NM" jdbcType="VARCHAR" property="devNm"></result>
@@ -26,20 +24,19 @@
         <result column="INSTALL_DATE" jdbcType="VARCHAR" property="installDate"></result>
 
     </resultMap>
-        <select id="getBusDevicesBySysId" parameterType="string" resultMap="DeviceAssetStatistics">
-            select dev.DEV_NM, dev.MODEL,dev.PARAM,dev.INSTALL_DATE,devtp.DEV_TP_NM,fac.FAC_NM
-            from bus_device as dev,bus_device_tp as devtp,bus_factory as fac
-            where dev.DEV_TP_ID=devtp.DEV_TP_ID and dev.FAC_ID=fac.FAC_ID
-            AND
-                <if test="proId !='' and proId != null">
-                        dev.PRO_ID = #{proId,jdbcType=VARCHAR}
-                </if>
-                AND
-                <if test="sysId !='' and sysId != null">
-                        dev.SYS_ID = #{sysId,jdbcType=VARCHAR}
-                </if>
-            ORDER BY INSTALL_DATE
-        </select>
+    <select id="getBusDevicesBySysId" parameterType="string" resultMap="DeviceAssetStatistics">
+        select dev.DEV_NM, dev.MODEL,dev.PARAM,dev.INSTALL_DATE,devtp.DEV_TP_NM,fac.FAC_NM
+        from bus_device as dev,bus_device_tp as devtp,bus_factory as fac
+        where dev.DEV_TP_ID=devtp.DEV_TP_ID and dev.FAC_ID=fac.FAC_ID
+
+        <if test="proId !='' and proId != null">
+            AND   dev.PRO_ID = #{proId,jdbcType=VARCHAR}
+        </if>
+        <if test="sysId !='' and sysId != null">
+            AND   dev.SYS_ID = #{sysId,jdbcType=VARCHAR}
+        </if>
+        ORDER BY INSTALL_DATE
+    </select>
     <select id="getProNameByProId" parameterType="string" resultType="string">
         select PRO_NM from bus_project where  PRO_ID =#{proId,jdbcType=VARCHAR}
     </select>