大家财险配置

src/main/java/com/ydtech/modules/admin/dao/SysUserMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.model.dto.SysUserDto;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserVO;
 import com.ydtech.modules.base.model.dto.PageDto;
@@ -112,19 +113,11 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     @Select("SELECT u.id,u.name,r.id roleId,r.name roleName FROM sys_user u " +
             "LEFT JOIN sys_user_role sur ON sur.user_id = u.id " +
-            "LEFT JOIN sys_role r ON r.id = sur.role_id WHERE r.id IN ('20','21') and u.status=1 and u.dept_id=#{deptId}")
+            "LEFT JOIN sys_role r ON r.id = sur.role_id WHERE r.id IN ('21') and u.status=1 and u.dept_id=#{deptId}")
     List<SysUserVO> findByReferrerId(@Param("deptId") String deptId);
 
 
-    //    @Select("select * from (" + selectUserParamSql + selectUserFromSql + selectUserFromWhereSql + " limit #{page.pageNum},#{page.pageSize} ) aaa")
-    @Select({"<script>",
-            "select * from (",
-            selectUserParamSql,
-            selectUserFromSql,
-            selectUserFromWhereSql,
-            " limit #{page.pageNum},#{page.pageSize} ) aaa",
-            "</script>"})
-    List<SysUserBaseVO> gainUserBaseInfo(@Param("page") PageDto pageDto);
+    Page<SysUserBaseVO> gainUserBaseInfo(@Param("page") Page page,@Param("user") SysUserDto user);
 
     /**
      * 获取用户列表

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.admin.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -10,6 +11,7 @@ import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.admin.dao.SysUserMapper;
 import com.ydtech.modules.admin.model.*;
+import com.ydtech.modules.admin.model.dto.SysUserDto;
 import com.ydtech.modules.admin.model.vo.SysUser2Vo;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserInternalVO;
@@ -234,35 +236,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public PageVo gainUserPage(PageDto pageDto) {
 
         PageVo<SysUserBaseVO> pageVo = new PageVo();
-
-        //获取分页数量
-        int total = super.baseMapper.gainUserBaseInfoCount(pageDto);
-
-        //计算mysql分页起索引
-        int firstIndex = pageDto.getPageNum() == 1 ? 0 : (pageDto.getPageNum() - 1) * pageDto.getPageSize();
-//        int firstIndex = pageDto.getPageNum() == 1 ? 0 : (pageDto.getPageNum() - 1) * pageDto.getPageSize() + 1;
-
-
-        //计算mysql分页总页数
-        int totalPages = total % pageDto.getPageSize() == 0 ? total / pageDto.getPageSize() : total / pageDto.getPageSize() + 1;
-
-//        if(pageRequest.getPageNum() > 0){
-//            int newPageNum = pageRequest.getPageNum() -1;
-//            pageRequest.setPageNum(newPageNum * pageRequest.getPageSize());
-//        }
-
-        //响应
-        pageVo.setTotalSize(total);
+        Page page = new Page(pageDto.getPageNum(), pageDto.getPageSize());
         pageVo.setPageNum(pageDto.getPageNum());
         pageVo.setPageSize(pageDto.getPageSize());
-        pageVo.setTotalPages(totalPages);
-
-
-        //请求替换分页开始索引
-        pageDto.setPageNum(firstIndex);
-        pageVo.setContent(super.baseMapper.gainUserBaseInfo(pageDto));
-
 
+        SysUserDto sysUserVO = JSONObject.parseObject(JSONObject.toJSONString(pageDto.getDto()), SysUserDto.class);
+        Page<SysUserBaseVO> sysUserBaseVOIPage = super.baseMapper.gainUserBaseInfo(page,sysUserVO);
+        pageVo.setContent(sysUserBaseVOIPage.getRecords());
+        pageVo.setTotalPages((int)sysUserBaseVOIPage.getPages());
+        pageVo.setTotalSize((int)sysUserBaseVOIPage.getTotal());
         return pageVo;
     }
 

src/main/java/com/ydtech/modules/order/components/dajia/DaJiaRequestApiComponents.java

@@ -69,6 +69,9 @@ public class DaJiaRequestApiComponents {
         ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.POST,  httpEntity, String.class);
         String body = response.getBody();
         InsuranceLog.infoLog(InsuranceEnum.AICS.getPinyin(), "\n\n---------> 响应参数:{}", body);
+        if(ObjectUtils.isEmpty(body)){
+            throw new SystemException("请求失败");
+        }
         //统一处理错误
         JSONObject resultObj = JSON.parseObject(body);
         String code = resultObj.getString("code");

src/main/java/com/ydtech/modules/order/service/impl/DaJiaOrderServiceImpl.java

@@ -412,20 +412,6 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
             kindList.add(kind);
         }
 
-        // 驾意险
-//        List<CalculatePremiumResponse.CarPolicySubInfoListDTO> carPolicySubInfoList =
-//                calculatePremiumResponse.getCarPolicySubInfoList();
-//
-//        if (carPolicySubInfoList != null && !carPolicySubInfoList.isEmpty()) {
-//            List<AccidentResponseVo> accidentResponseVos =
-//                    CalculatePremiumResponse.CarPolicySubInfoListDTO.toAccidentResponseVoList(carPolicySubInfoList,
-//                            accidentalDrivingVo);
-//            quoteRespVo.setAccident(accidentResponseVos);
-//            // 驾意险价格
-//            BigDecimal bigDecimal = CalculatePremiumResponse.CarPolicySubInfoListDTO.sumPremium(carPolicySubInfoList);
-//            jyPremium = bigDecimal.doubleValue();
-//        }
-
         if (!Objects.isNull(nvhlodr1001Response)) {
             jyPremium = Double.parseDouble(nvhlodr1001Response.getOrderPrm());
         }
@@ -467,8 +453,6 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
             //获取公司配置信息
             DaJiaConfigureParameters daJiaConfigureParameters = new DaJiaConfigureParameters();
             configureParametersComponents.toEntity(daJiaConfigureParameters, insAreaCompany.getAgreementId());
-            //先进行影像提交
-//            submitImage(companyId);
 
             //1009返回数据
             ODR1009Response.ResultDTO resultDTO = JSONObject.parseObject(

src/main/resources/application-prod.yml

@@ -227,6 +227,11 @@ zijin:
     # 下载保单地址
     downLoadDocument: http://open.zking.com/temp/api/v1/insurance/nonAutoMobile/queryPolicy/downLoadDocument
 
+#大家财险api
+dajia:
+  api:
+    url: https://ics.djbx.com/sip-agent/simpleRequest/
+    encryptKey: "qwertyuiopasdfgh"
 
 agreement:
   shutdown: true

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -74,4 +74,48 @@
             <include refid="Sys_User_Where_Clause"></include>
     </select>
 
+
+    <select id="gainUserBaseInfo" resultType="com.ydtech.modules.admin.model.vo.SysUserBaseVO">
+        select
+            su.id as userId,
+            su.name,
+            info.sex,
+            su.mobile,
+            su.status,
+            sd.id as deptId,
+            sd.name as deptName,
+            psd.id as pDeptId,
+            psd.name as pDeptName,
+            t4.id as roleId,
+            t4.name as roleName
+        from sys_user su
+        left join sys_dept sd on su.dept_id=sd.id
+        left join sys_dept psd on sd.parent_id=psd.id
+        left join sys_user_info info on info.id=su.id
+        left join sys_user_role t3 on su.id=t3.user_id
+        left join sys_role t4 on t3.role_id=t4.id
+        where 1=1
+        AND sd.id &lt;&gt; ''
+        <if test='user !=null  '>
+            <if test='user.status !=null and user.status!="" '>
+                 and su.status = #{user.status}
+                </if>
+            <if test='user.name !=null and user.name!="" '>
+                 and su.name like concat('%',#{user.name},'%')
+                </if>
+            <if test='user.userId !=null and user.userId!="" '>
+                 and su.id = #{user.userId}
+                </if>
+            <if test='user.mobile !=null and user.mobile!=""  '>
+                 and su.mobile = #{user.mobile}
+                </if>
+            <if test='user.deptId !=null and user.deptId!=""  '>
+                 and su.dept_id like concat('%',#{user.deptId},'%')
+                </if>
+            <if test='user.roleId !=null and user.roleId!=""  '>
+                 and t3.role_id = #{user.roleId}
+                </if>
+            </if>
+
+    </select>
 </mapper>