Browse Source

message:

改bug
dev_power_axis
HAHA 3 years ago
parent
commit
f241ce0437
  1. 2
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java
  2. 2
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java
  3. 2
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java
  4. 3
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java
  5. 6
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java
  6. 12
      epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml

2
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java

@ -12,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Random;
import java.util.UUID;
/***
* 动力主轴相关数据可视化接口

2
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java

@ -30,4 +30,6 @@ public interface PowerKernelHouseholdDao extends BaseDao<PowerKernelHouseholdEnt
List<PowerKernelListPostitionResultDTO> getListPosition(PowerKernelListPostitionFormDTO form);
long getListTotal(PowerKernelListPostitionFormDTO form);
int queryRepeatHouseId(PowerKernelHouseholdEntity entity);
}

2
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java

@ -97,4 +97,6 @@ public interface PowerKernelHouseholdService extends BaseService<PowerKernelHous
long getListTotal(PowerKernelListPostitionFormDTO form);
void bind(PowerKernelHouseFormDTO form);
}

3
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java

@ -100,7 +100,6 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
this.assembleStruct(entity);
baseDao.insert(entity);
insert(entity);
}
@Override
@ -262,7 +261,7 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
@Override
public PowerAxisStructViewResultDTO getStatistics(PowerAxisStructViewFormDTO form) {
form.setCustomerId(loginUserUtil.getLoginUserCustomerId());
// 查网格党支部数 grid_party
int gridParty = baseDao.queryGridParty(form);
// 查楼院党小组数 group_party

6
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java

@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.ConvertUtils;
@ -175,6 +178,9 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
entity.setOwnerName(houseDto.getOwnerName());
entity.setStructReferenceId(form.getAxisStructId());
if(baseDao.queryRepeatHouseId(entity) > NumConstant.ZERO){
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "只允许绑定一次");
}
powerKernelHouseholdService.insert(entity);
}
}

12
epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml

@ -29,7 +29,7 @@
WHERE
STRUCT_REFERENCE_ID = #{axisStructId}
AND
customer_id = #{customerrId}
customer_id = #{customerId}
</select>
<select id="getListPosition"
resultType="com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO">
@ -71,6 +71,16 @@
limit
#{pageNo},#{pageSize}
</select>
<select id="queryRepeatHouseId" resultType="java.lang.Integer">
SELECT
count(*)
FROM
pli_power_kernel_household
WHERE
STRUCT_REFERENCE_ID = #{structReferenceId}
AND
HOUSE_ID = #{houseId}
</select>
</mapper>
Loading…
Cancel
Save