Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增根据组织id查询组织模板授权接口

Browse Source
This commit is contained in:
yangsb
2024-04-01 17:37:53 +08:00
parent 64c0043844
commit 6e9032241e
5 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java
+8
View File
@@ -146,5 +146,13 @@ public class MachineTemplateController {
return success(machineTemplateService.organTemplatePage(page));
}
@GetMapping("organ-template-by-organId")
@Operation(summary = "根据组织id查询组织模板授权")
@PreAuthorize("@ss.hasPermission('machine-template::query')")
@Parameter(name = "organId", description = "组织id", required = true, example = "1")
public CommonResult<OrganTemplateResp> organTemplateByOrganId(@RequestParam Long organId ) {
return success(machineTemplateService.organTemplateByOrganId(organId));
}
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java
+4 -2
View File
@@ -33,9 +33,11 @@ public interface MachineTemplateMapper extends BaseMapperX<MachineTemplateDO> {
List<AutoTemplateVO> selectAuthTemplateList(Map<String, Object> map);
Page<OrganTemplateResp> selectOrganTemplatePage(@Param("page") Page<OrganTemplateResp> respPage, @Param("vo") OrganTemplatePage page);
//Page<OrganTemplateResp> selectOrganTemplatePage(@Param("page") Page<OrganTemplateResp> respPage, @Param("vo") OrganTemplatePage page);
List<OrganTemplateVO> selectOrganTemplateList(Map<String, Object> map);
Page<OrganTemplateResp> xxselectOrganTemplatePage(@Param("page") Page<OrganTemplateResp> respPage, @Param("vo") OrganTemplatePage page);
Page<OrganTemplateResp> selectOrganTemplatePage(@Param("page") Page<OrganTemplateResp> respPage, @Param("vo") OrganTemplatePage page);
OrganTemplateResp selectOrganTemplate(Long organId);
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java
+2
View File
@@ -50,4 +50,6 @@ public interface MachineTemplateService {
Boolean auth(MachineOrgAuthReq vo);
PageResult<OrganTemplateResp> organTemplatePage(OrganTemplatePage page);
OrganTemplateResp organTemplateByOrganId(Long organId);
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java
+6 -1
View File
@@ -278,10 +278,15 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
@Override
public PageResult<OrganTemplateResp> organTemplatePage(OrganTemplatePage page) {
Page<OrganTemplateResp> respPage = new Page<>(page.getPageNo(), page.getPageSize());
Page<OrganTemplateResp> pageRes = machineTemplateMapper.xxselectOrganTemplatePage(respPage, page);
Page<OrganTemplateResp> pageRes = machineTemplateMapper.selectOrganTemplatePage(respPage, page);
return new PageResult<>(pageRes.getRecords(), pageRes.getTotal());
}
@Override
public OrganTemplateResp organTemplateByOrganId(Long organId) {
return machineTemplateMapper.selectOrganTemplate(organId);
}
@Override
public Boolean deleteCuttingTemplate(Long id) {
cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml
+15 -3
View File
@@ -18,7 +18,7 @@
<result property="organName" column="organName"/>
<result property="updateTime" column="updateTime"/>
<collection property="authTemplateList" javaType="java.util.List" ofType="com.cf.imes.module.system.controller.admin.machine.vo.OrganTemplateVO"
select="selectOrganTemplateList" column="{organId=organId, templateName = templateName}" notNullColumn="templateId" >
select="selectOrganTemplateList" column="{organId=organId}" >
</collection>
</resultMap>
@@ -66,7 +66,7 @@
</where>
</select>
<select id="selectOrganTemplatePage" resultMap="orgMap">
<!--<select id="selectOrganTemplatePage" resultMap="orgMap">
select a.id as organId, a.name as organName, max(b.create_time) as updateTime,
case when ('${vo.templateName}' != '') then '${vo.templateName}' else '' end as templateName
from system_organization a, system_organ_machine b
@@ -79,7 +79,7 @@
GROUP BY organId
order by updateTime desc
</select>
</select>-->
<select id="selectOrganTemplateList"
resultType="com.cf.imes.module.system.controller.admin.machine.vo.OrganTemplateVO">
@@ -94,6 +94,7 @@
</if>
</where>
</select>
<select id="xxselectOrganTemplatePage" resultMap="xxMap">
select * from (
select a.id as organId, a.name as organName, max(b.create_time) as updateTime,
@@ -121,4 +122,15 @@
order by updateTime desc
</select>
<select id="selectOrganTemplate" resultMap="orgMap">
select a.id as organId, a.name as organName, max(b.create_time) as updateTime
from system_organization a, system_organ_machine b
<where>
a.id = b.organ_id
and a.id = #{vo.organId}
</where>
GROUP BY organId
</select>
</mapper>