Merge remote-tracking branch 'origin/jtdev' into jtdev

zhongrj

2023-04-28 b59efa774fbf19c39da44b6cb4f5c65f1f7e0d25

Merge remote-tracking branch 'origin/jtdev' into jtdev

 skjcmanager/skjcmanager-ops/skjcmanager-flow/src/main/java/cn/gistack/flow/engine/controller/FlowModelController.java

@@ -46,7 +46,7 @@
@RestController
@RequestMapping("model")
@AllArgsConstructor
@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
//@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
public class FlowModelController {

    private final FlowEngineService flowEngineService;

 skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/resources/application.yml

@@ -7,7 +7,7 @@
  enabled: true
  name: minio
  tenant-mode: true
  endpoint: http://127.0.0.1:9000
  access-key: D99KGE6ZTQXSATTJWU24
  secret-key: QyVqGnhIQQE734UYSUFlGOZViE6+ZlDEfUG3NjhJ
  bucket-name: bladex
  endpoint: http://10.10.2.251:8082
  access-key: minioadmin
  secret-key: Gistack@2023_hb
  bucket-name: test

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/controller/AppManageController.java

@@ -77,4 +77,16 @@
        return R.data(appManageService.removeById(id));
    }

    /**
     * 查询最新一条的数据
     *
     * @return
     */
    @ApiOperation(value = "app管理-分页列表查询", notes = "app管理-分页列表查询")
    @GetMapping(value = "/getLastInfo")
    public R getLastInfo() {
        AppManage appManage = appManageService.getLastInfo();
        return R.data(appManage);
    }

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/mapper/AppManageMapper.java

@@ -11,4 +11,5 @@
 * @Version 1.0
 */
public interface AppManageMapper extends BaseMapper<AppManage> {
    AppManage getLastInfo();
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/mapper/AppManageMapper.xml

@@ -3,4 +3,7 @@
<mapper namespace="cn.gistack.sm.appmanage.mapper.AppManageMapper">


    <select id="getLastInfo" resultType="cn.gistack.sm.appmanage.entity.AppManage">
        SELECT * FROM SM_APP_MANAGE ORDER BY CREATE_TIME DESC LIMIT 1
    </select>
</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/service/IAppManageService.java

@@ -11,4 +11,9 @@
 * @Version 1.0
 */
public interface IAppManageService extends BaseService<AppManage> {
    /**
     * 获取最新的数据
     * @return
     */
    AppManage getLastInfo();
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/appmanage/service/impl/AppManageService.java

@@ -3,6 +3,7 @@
import cn.gistack.sm.appmanage.entity.AppManage;
import cn.gistack.sm.appmanage.mapper.AppManageMapper;
import cn.gistack.sm.appmanage.service.IAppManageService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;

@@ -15,4 +16,8 @@
 */
@Service
public class AppManageService extends BaseServiceImpl<AppManageMapper, AppManage> implements IAppManageService {
    @Override
    public AppManage getLastInfo() {
        return baseMapper.getLastInfo();
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml

@@ -23,6 +23,12 @@
        <if test="patrolTask.projectId !=null and patrolTask.projectId !='' ">
            AND spt.project_id = #{patrolTask.projectId}
        </if>
        <if test="patrolTask.toUserId != null and patrolTask.toUserId !=''">
            AND spt.to_user_id = #{patrolTask.toUserId}
        </if>
        <if test="patrolTask.state != null and patrolTask.state !=''">
            AND spt.state = #{patrolTask.state}
        </if>
    </select>

    <!--查询巡查人员统计数据信息-->