bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交相关代码

This commit is contained in:
zfhai 2023-12-08 14:01:39 +08:00
parent e13dc8f6fa
commit e4315a5ab3
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zlpt-common/zlpt-common-swagger/pom.xml
View File

@ -34,6 +34,10 @@
<groupId>com.bonus.zlpt</groupId>
<artifactId>zlpt-common-core</artifactId>
</dependency>
<dependency>
<groupId>com.bonus.zlpt</groupId>
<artifactId>zlpt-common-core</artifactId>
</dependency>
</dependencies>
</dependencies>
</project>

6
zlpt-modules/zlpt-equip/pom.xml
View File

@ -71,10 +71,8 @@
<groupId>com.bonus.zlpt</groupId>
<artifactId>zlpt-common-log</artifactId>
</dependency>
<dependency>
<groupId>com.bonus.zlpt</groupId>
<artifactId>zlpt-common-log</artifactId>
</dependency>
<dependency>
<groupId>com.bonus.zlpt</groupId>
<artifactId>zlpt-common-swagger</artifactId>

16
zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
View File

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.zlpt.equip.mapper.DevInfoMapper">
<resultMap type="com.bonus.zlpt.equip.api.domain.DevInfo" id="DevInfoResult">
<resultMap type="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo" id="DevInfoResult">
<result property="maId" column="ma_id" />
<result property="code" column="code" />
<result property="typeId" column="type_id" />
@ -33,6 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="isActive" column="is_active" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="deviceName" column="device_name" />
<result property="groupName" column="group_name" />
<result property="companyName" column="company_name" />
</resultMap>
<sql id="selectDevInfoVo">
@ -122,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join ma_type_info p on t.parent_id=p.type_id) t on d.type_id = t.type_id
left join bm_company_info c on d.own_co = c.company_id
left join ma_hot_search h on d.ma_id = h.ma_id
left join ma_type_info t on d.type_id = t.type_id
left join ma_type_info ti on d.type_id = ti.type_id
where d.is_active='1'
order by h.search_num
</select>
@ -308,4 +311,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{maId}
</foreach>
</update>
<select id="productList" parameterType="com.bonus.zlpt.equip.api.domain.DevInfo" resultType="com.bonus.zlpt.equip.api.domain.vo.MaDevInfoVo">
select d.*,t.type_name as device_name,t.parent_name as group_name,c.company_name
from ma_dev_info d
left join (select t.*, p.type_name as parent_name
from ma_type_info t
left join ma_type_info p on t.parent_id=p.type_id) t on d.type_id = t.type_id
left join bm_company_info c on d.own_co = c.company_id
</select>
</mapper>

6
zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/controller/BaseAddressController.java
View File

@ -1,9 +1,9 @@
package com.bonus.zlpt.company.controller;
package com.bonus.zlpt.system.controller;
import com.bonus.zlpt.common.core.web.controller.BaseController;
import com.bonus.zlpt.common.core.web.domain.AjaxResult;
import com.bonus.zlpt.company.api.domain.BaseAddress;
import com.bonus.zlpt.company.service.BaseAddressService;
import com.bonus.zlpt.system.api.domain.BaseAddress;
import com.bonus.zlpt.system.service.BaseAddressService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;